target
stringlengths 20
113k
| src_fm
stringlengths 11
86.3k
| src_fm_fc
stringlengths 21
86.4k
| src_fm_fc_co
stringlengths 30
86.4k
| src_fm_fc_ms
stringlengths 42
86.8k
| src_fm_fc_ms_ff
stringlengths 43
86.8k
|
|---|---|---|---|---|---|
@Test public void shouldNotUseProxyIfNotConfigured() throws URISyntaxException { baseConfig.getMain().setProxyType(ProxyType.NONE); OkHttpClient client = testee.getOkHttpClientBuilder(new URI("http: assertThat(client.socketFactory() instanceof SockProxySocketFactory, is(false)); assertThat(client.proxy(), is(nullValue())); } | public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } @PostConstruct void init(); @EventListener void handleConfigChangedEvent(ConfigChangedEvent event); @Override ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod); @Override AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod); Builder getOkHttpClientBuilder(URI requestUri); static long ipToLong(InetAddress ip); } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } @PostConstruct void init(); @EventListener void handleConfigChangedEvent(ConfigChangedEvent event); @Override ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod); @Override AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod); Builder getOkHttpClientBuilder(URI requestUri); static long ipToLong(InetAddress ip); } |
@Test public void shouldUseHttpProxyIfConfigured() throws URISyntaxException { baseConfig.getMain().setProxyType(ProxyType.HTTP); baseConfig.getMain().setProxyHost("proxyhost"); baseConfig.getMain().setProxyPort(1234); OkHttpClient client = testee.getOkHttpClientBuilder(new URI("http: assertThat(client.proxy().address(), equalTo(new InetSocketAddress("proxyhost", 1234))); } | public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } @PostConstruct void init(); @EventListener void handleConfigChangedEvent(ConfigChangedEvent event); @Override ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod); @Override AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod); Builder getOkHttpClientBuilder(URI requestUri); static long ipToLong(InetAddress ip); } | HydraOkHttp3ClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory { public Builder getOkHttpClientBuilder(URI requestUri) { Builder builder = getBaseBuilder(); configureBuilderForSsl(requestUri, builder); MainConfig main = configProvider.getBaseConfig().getMain(); if (main.getProxyType() == ProxyType.NONE) { return builder; } if (isUriToBeIgnoredByProxy(requestUri.getHost())) { logger.debug("Not using proxy for request to {}", requestUri.getHost()); return builder; } if (main.getProxyType() == ProxyType.SOCKS) { return builder.socketFactory(sockProxySocketFactory); } else if (main.getProxyType() == ProxyType.HTTP) { builder = builder.proxy(new Proxy(Type.HTTP, new InetSocketAddress(main.getProxyHost(), main.getProxyPort()))).proxyAuthenticator((Route route, Response response) -> { if (response.request().header("Proxy-Authorization") != null) { logger.warn("Authentication with proxy failed"); return null; } String credential = Credentials.basic(main.getProxyUsername(), main.getProxyPassword()); return response.request().newBuilder() .header("Proxy-Authorization", credential).build(); }); } return builder; } @PostConstruct void init(); @EventListener void handleConfigChangedEvent(ConfigChangedEvent event); @Override ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod); @Override AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod); Builder getOkHttpClientBuilder(URI requestUri); static long ipToLong(InetAddress ip); } |
@Test public void testThatChecksForUpdateAvailable() throws Exception { assertTrue(testee.isUpdateAvailable()); testee.currentVersion = new SemanticVersion("v2.0.0"); assertFalse(testee.isUpdateAvailable()); } | public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void testThatChecksForUpdateAvailableWithPrerelease() throws Exception { assertTrue(testee.isUpdateAvailable()); configProviderMock.getBaseConfig().getMain().setUpdateToPrereleases(true); testee.currentVersion = new SemanticVersion("v2.3.4"); assertFalse(testee.isUpdateAvailable()); } | public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public boolean isUpdateAvailable() { try { return getLatestVersion().isUpdateFor(currentVersion) && !latestVersionIgnored() && !latestVersionBlocked() && latestVersionFinalOrPreEnabled(); } catch (UpdateException e) { logger.error("Error while checking if new version is available", e); return false; } } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void shouldGetLatestReleaseFromGithub() throws Exception { String latestVersionString = testee.getLatestVersionString(); assertEquals("2.0.0", latestVersionString); testee.getLatestVersionString(); } | public String getLatestVersionString() throws UpdateException { return getLatestVersion().toString(); } | UpdateManager implements InitializingBean { public String getLatestVersionString() throws UpdateException { return getLatestVersion().toString(); } } | UpdateManager implements InitializingBean { public String getLatestVersionString() throws UpdateException { return getLatestVersion().toString(); } UpdateManager(); } | UpdateManager implements InitializingBean { public String getLatestVersionString() throws UpdateException { return getLatestVersion().toString(); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public String getLatestVersionString() throws UpdateException { return getLatestVersion().toString(); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void shouldGetAllChangesIncludingPrereleaseWhenRunningFinal() throws Exception { when(webAccessMock.callUrl(eq("http:/127.0.0.1:7070/changelog"))).thenReturn( objectMapper.writeValueAsString(Arrays.asList( new ChangelogVersionEntry("2.0.1", null, false, Arrays.asList(new ChangelogChangeEntry("note", "this is a newer prerelease"))), new ChangelogVersionEntry("2.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Next final release"))), new ChangelogVersionEntry("1.0.1", null, false, Arrays.asList(new ChangelogChangeEntry("note", "A betal release"))), new ChangelogVersionEntry("1.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Initial final release"))) ))); List<ChangelogVersionEntry> changesSince = testee.getChangesSinceCurrentVersion(); assertEquals(2, changesSince.size()); assertEquals("2.0.0", changesSince.get(0).getVersion()); assertEquals("1.0.1", changesSince.get(1).getVersion()); } | public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void shouldGetAllChangesIncludingPrereleaseWhenInstallingPrereleases() throws Exception { baseConfig.getMain().setUpdateToPrereleases(true); when(webAccessMock.callUrl(eq("http:/127.0.0.1:7070/changelog"))).thenReturn( objectMapper.writeValueAsString(Arrays.asList( new ChangelogVersionEntry("2.0.1", null, false, Arrays.asList(new ChangelogChangeEntry("note", "this is a newer prerelease"))), new ChangelogVersionEntry("2.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Next final release"))), new ChangelogVersionEntry("1.0.1", null, false, Arrays.asList(new ChangelogChangeEntry("note", "A betal release"))), new ChangelogVersionEntry("1.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Initial final release"))) ))); List<ChangelogVersionEntry> changesSince = testee.getChangesSinceCurrentVersion(); assertEquals(3, changesSince.size()); assertEquals("2.0.1", changesSince.get(0).getVersion()); assertEquals("2.0.0", changesSince.get(1).getVersion()); assertEquals("1.0.1", changesSince.get(2).getVersion()); } | public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void shouldCalculateNextHitWithRollingTimeWindows() throws Exception { indexerConfigMock.setHitLimitResetTime(null); Instant firstInWindow = Instant.now().minus(12, ChronoUnit.HOURS); LocalDateTime nextHit = testee.calculateNextPossibleHit(indexerConfigMock, firstInWindow); assertEquals(LocalDateTime.ofInstant(firstInWindow, ZoneOffset.UTC).plus(24, ChronoUnit.HOURS), nextHit); } | LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldGetAllChangesWithoutPrerelease() throws Exception { when(webAccessMock.callUrl(eq("http:/127.0.0.1:7070/changelog"))).thenReturn( objectMapper.writeValueAsString(Arrays.asList( new ChangelogVersionEntry("2.0.1", null, false, Arrays.asList(new ChangelogChangeEntry("note", "this is a newer prerelease"))), new ChangelogVersionEntry("2.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Next final release"))), new ChangelogVersionEntry("1.0.0", null, true, Arrays.asList(new ChangelogChangeEntry("note", "Initial final release"))) ))); List<ChangelogVersionEntry> changesSince = testee.getChangesSinceCurrentVersion(); assertEquals(1, changesSince.size()); assertEquals("2.0.0", changesSince.get(0).getVersion()); } | public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); } | UpdateManager implements InitializingBean { public List<ChangelogVersionEntry> getChangesSinceCurrentVersion() throws UpdateException { if (latestVersion == null) { getLatestVersion(); } List<ChangelogVersionEntry> allChanges; try { String response = webAccess.callUrl(changelogUrl); allChanges = objectMapper.readValue(response, new TypeReference<List<ChangelogVersionEntry>>() { }); } catch (IOException e) { throw new UpdateException("Error while getting changelog: " + e.getMessage()); } final Optional<ChangelogVersionEntry> newestFinalUpdate = allChanges.stream().filter(x -> x.isFinal() && new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)).max(Comparator.naturalOrder()); List<ChangelogVersionEntry> collectedVersionChanges = allChanges.stream().filter(x -> { if (!new SemanticVersion(x.getVersion()).isUpdateFor(currentVersion)) { return false; } if (x.isFinal()) { return true; } else { if (configProvider.getBaseConfig().getMain().isUpdateToPrereleases()) { return true; } else { return newestFinalUpdate.isPresent() && newestFinalUpdate.get().getSemanticVersion().isUpdateFor(x.getSemanticVersion()); } } } ).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); return collectedVersionChanges.stream() .sorted(Comparator.reverseOrder()) .collect(Collectors.toList()); } UpdateManager(); boolean isUpdateAvailable(); boolean latestVersionFinalOrPreEnabled(); boolean latestVersionIgnored(); boolean latestVersionBlocked(); String getLatestVersionString(); String getCurrentVersionString(); void ignore(String version); List<ChangelogVersionEntry> getChangesSinceCurrentVersion(); List<ChangelogVersionEntry> getAllVersionChangesUpToCurrentVersion(); List<ChangelogVersionEntry> getAutomaticUpdateVersionHistory(); void installUpdate(boolean isAutomaticUpdate); void exitWithReturnCode(final int returnCode); @Override void afterPropertiesSet(); PackageInfo getPackageInfo(); static final int SHUTDOWN_RETURN_CODE; static final int UPDATE_RETURN_CODE; static final int RESTART_RETURN_CODE; static final int RESTORE_RETURN_CODE; static final String KEY; } |
@Test public void shouldOnlyUseTorznabIndexersForTorrentSearches() throws Exception { indexerConfigMock.setSearchModuleType(SearchModuleType.NEWZNAB); when(searchRequest.getDownloadType()).thenReturn(org.nzbhydra.searching.dtoseventsenums.DownloadType.TORRENT); assertFalse("Only torznab indexers should be used for torrent searches", testee.checkTorznabOnlyUsedForTorrentOrInternalSearches(indexer)); indexerConfigMock.setSearchModuleType(SearchModuleType.TORZNAB); when(searchRequest.getDownloadType()).thenReturn(org.nzbhydra.searching.dtoseventsenums.DownloadType.TORRENT); assertTrue("Torznab indexers should be used for torrent searches", testee.checkTorznabOnlyUsedForTorrentOrInternalSearches(indexer)); indexerConfigMock.setSearchModuleType(SearchModuleType.TORZNAB); when(searchRequest.getSource()).thenReturn(SearchSource.INTERNAL); when(searchRequest.getDownloadType()).thenReturn(org.nzbhydra.searching.dtoseventsenums.DownloadType.NZB); assertTrue("Torznab indexers should be selected for internal NZB searches", testee.checkTorznabOnlyUsedForTorrentOrInternalSearches(indexer)); indexerConfigMock.setSearchModuleType(SearchModuleType.TORZNAB); when(searchRequest.getSource()).thenReturn(SearchSource.API); when(searchRequest.getDownloadType()).thenReturn(DownloadType.NZB); assertFalse("Torznab indexers should not be selected for API NZB searches", testee.checkTorznabOnlyUsedForTorrentOrInternalSearches(indexer)); } | protected boolean checkTorznabOnlyUsedForTorrentOrInternalSearches(Indexer indexer) { if (searchRequest.getDownloadType() == DownloadType.TORRENT && indexer.getConfig().getSearchModuleType() != SearchModuleType.TORZNAB) { String message = String.format("Not using %s because a torrent search is requested", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No torrent search"); } if (searchRequest.getDownloadType() == DownloadType.NZB && indexer.getConfig().getSearchModuleType() == SearchModuleType.TORZNAB && searchRequest.getSource() == SearchSource.API) { String message = String.format("Not using %s because torznab indexers cannot be used by API NZB searches", indexer.getName()); return handleIndexerNotSelected(indexer, message, "NZB API search"); } return true; } | IndexerForSearchSelector { protected boolean checkTorznabOnlyUsedForTorrentOrInternalSearches(Indexer indexer) { if (searchRequest.getDownloadType() == DownloadType.TORRENT && indexer.getConfig().getSearchModuleType() != SearchModuleType.TORZNAB) { String message = String.format("Not using %s because a torrent search is requested", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No torrent search"); } if (searchRequest.getDownloadType() == DownloadType.NZB && indexer.getConfig().getSearchModuleType() == SearchModuleType.TORZNAB && searchRequest.getSource() == SearchSource.API) { String message = String.format("Not using %s because torznab indexers cannot be used by API NZB searches", indexer.getName()); return handleIndexerNotSelected(indexer, message, "NZB API search"); } return true; } } | IndexerForSearchSelector { protected boolean checkTorznabOnlyUsedForTorrentOrInternalSearches(Indexer indexer) { if (searchRequest.getDownloadType() == DownloadType.TORRENT && indexer.getConfig().getSearchModuleType() != SearchModuleType.TORZNAB) { String message = String.format("Not using %s because a torrent search is requested", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No torrent search"); } if (searchRequest.getDownloadType() == DownloadType.NZB && indexer.getConfig().getSearchModuleType() == SearchModuleType.TORZNAB && searchRequest.getSource() == SearchSource.API) { String message = String.format("Not using %s because torznab indexers cannot be used by API NZB searches", indexer.getName()); return handleIndexerNotSelected(indexer, message, "NZB API search"); } return true; } } | IndexerForSearchSelector { protected boolean checkTorznabOnlyUsedForTorrentOrInternalSearches(Indexer indexer) { if (searchRequest.getDownloadType() == DownloadType.TORRENT && indexer.getConfig().getSearchModuleType() != SearchModuleType.TORZNAB) { String message = String.format("Not using %s because a torrent search is requested", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No torrent search"); } if (searchRequest.getDownloadType() == DownloadType.NZB && indexer.getConfig().getSearchModuleType() == SearchModuleType.TORZNAB && searchRequest.getSource() == SearchSource.API) { String message = String.format("Not using %s because torznab indexers cannot be used by API NZB searches", indexer.getName()); return handleIndexerNotSelected(indexer, message, "NZB API search"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkTorznabOnlyUsedForTorrentOrInternalSearches(Indexer indexer) { if (searchRequest.getDownloadType() == DownloadType.TORRENT && indexer.getConfig().getSearchModuleType() != SearchModuleType.TORZNAB) { String message = String.format("Not using %s because a torrent search is requested", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No torrent search"); } if (searchRequest.getDownloadType() == DownloadType.NZB && indexer.getConfig().getSearchModuleType() == SearchModuleType.TORZNAB && searchRequest.getSource() == SearchSource.API) { String message = String.format("Not using %s because torznab indexers cannot be used by API NZB searches", indexer.getName()); return handleIndexerNotSelected(indexer, message, "NZB API search"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldCalculateNextHitWithFixedResetTime() { Instant currentTime = Instant.ofEpochSecond(1518500323); testee.clock = Clock.fixed(currentTime, ZoneId.of("UTC")); indexerConfigMock.setHitLimitResetTime(10); LocalDateTime nextHit = testee.calculateNextPossibleHit(indexerConfigMock, currentTime); assertThat(nextHit.getHour()).isEqualTo(10); assertThat(nextHit.getDayOfYear()).isEqualTo(LocalDateTime.ofInstant(currentTime, ZoneId.of("UTC")).get(ChronoField.DAY_OF_YEAR)); currentTime = Instant.ofEpochSecond(1518500323); testee.clock = Clock.fixed(currentTime, ZoneId.of("UTC")); indexerConfigMock.setHitLimitResetTime(4); nextHit = testee.calculateNextPossibleHit(indexerConfigMock, currentTime); assertThat(nextHit.getHour()).isEqualTo(4); assertThat(nextHit.getDayOfYear()).isEqualTo(LocalDateTime.ofInstant(currentTime, ZoneId.of("UTC")).get(ChronoField.DAY_OF_YEAR) + 1); } | LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { LocalDateTime calculateNextPossibleHit(IndexerConfig indexerConfig, Instant firstInWindowAccessTime) { LocalDateTime nextPossibleHit; if (indexerConfig.getHitLimitResetTime().isPresent()) { LocalDateTime now = LocalDateTime.now(clock); nextPossibleHit = now.with(ChronoField.HOUR_OF_DAY, indexerConfig.getHitLimitResetTime().get()).with(ChronoField.MINUTE_OF_HOUR, 0); if (nextPossibleHit.isBefore(now)) { nextPossibleHit = nextPossibleHit.plus(1, ChronoUnit.DAYS); } } else { nextPossibleHit = LocalDateTime.ofInstant(firstInWindowAccessTime, ZoneOffset.UTC).plus(1, ChronoUnit.DAYS); } return nextPossibleHit; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldConvertSearchNewznabCategoriesToInternalCategory() throws Exception { assertThat(testee.fromSearchNewznabCategories(Arrays.asList(3000), CategoriesConfig.allCategory).getName(), is("3000,3030")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(3030), CategoriesConfig.allCategory).getName(), is("3000,3030")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(7020), CategoriesConfig.allCategory).getName(), is("7020,8010")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(7000, 7020), CategoriesConfig.allCategory).getName(), is("7020,8010")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(7020, 8010), CategoriesConfig.allCategory).getName(), is("7020,8010")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(4000), CategoriesConfig.allCategory).getName(), is("4000")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(4020), CategoriesConfig.allCategory).getName(), is("4000")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(4090), CategoriesConfig.allCategory).getName(), is("4090")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(4000, 4090), CategoriesConfig.allCategory).getName(), is("4000")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(7090), CategoriesConfig.allCategory).getName(), is("All")); assertThat(testee.fromSearchNewznabCategories("4000").getName(), is("4000")); assertThat(testee.fromSearchNewznabCategories("7020,8010").getName(), is("7020,8010")); assertThat(testee.fromSearchNewznabCategories(Collections.emptyList(), CategoriesConfig.allCategory).getName(), is("All")); assertThat(testee.fromSearchNewznabCategories("").getName(), is("N/A")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(4030, 4090), CategoriesConfig.allCategory).getName(), is("4000")); assertThat(testee.fromSearchNewznabCategories(Arrays.asList(3000, 4000), CategoriesConfig.allCategory).getName(), is("4000")); } | public Category fromSearchNewznabCategories(String cats) { if (StringUtils.isEmpty(cats)) { return getNotAvailable(); } try { return fromSearchNewznabCategories(Arrays.stream(cats.split(",")).map(Integer::valueOf).collect(Collectors.toList()), getNotAvailable()); } catch (NumberFormatException e) { logger.error("Unable to parse categories string '{}'", cats); return getNotAvailable(); } } | CategoryProvider implements InitializingBean { public Category fromSearchNewznabCategories(String cats) { if (StringUtils.isEmpty(cats)) { return getNotAvailable(); } try { return fromSearchNewznabCategories(Arrays.stream(cats.split(",")).map(Integer::valueOf).collect(Collectors.toList()), getNotAvailable()); } catch (NumberFormatException e) { logger.error("Unable to parse categories string '{}'", cats); return getNotAvailable(); } } } | CategoryProvider implements InitializingBean { public Category fromSearchNewznabCategories(String cats) { if (StringUtils.isEmpty(cats)) { return getNotAvailable(); } try { return fromSearchNewznabCategories(Arrays.stream(cats.split(",")).map(Integer::valueOf).collect(Collectors.toList()), getNotAvailable()); } catch (NumberFormatException e) { logger.error("Unable to parse categories string '{}'", cats); return getNotAvailable(); } } CategoryProvider(); } | CategoryProvider implements InitializingBean { public Category fromSearchNewznabCategories(String cats) { if (StringUtils.isEmpty(cats)) { return getNotAvailable(); } try { return fromSearchNewznabCategories(Arrays.stream(cats.split(",")).map(Integer::valueOf).collect(Collectors.toList()), getNotAvailable()); } catch (NumberFormatException e) { logger.error("Unable to parse categories string '{}'", cats); return getNotAvailable(); } } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); } | CategoryProvider implements InitializingBean { public Category fromSearchNewznabCategories(String cats) { if (StringUtils.isEmpty(cats)) { return getNotAvailable(); } try { return fromSearchNewznabCategories(Arrays.stream(cats.split(",")).map(Integer::valueOf).collect(Collectors.toList()), getNotAvailable()); } catch (NumberFormatException e) { logger.error("Unable to parse categories string '{}'", cats); return getNotAvailable(); } } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); static final Category naCategory; } |
@Test public void shouldConvertIndexerNewznabCategoriesToInternalCategory() throws Exception { assertThat(testee.fromResultNewznabCategories(Collections.emptyList()).getName(), is("N/A")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(4000, 4090)).getName(), is("4090")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(4000, 4090, 10_000)).getName(), is("4090")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(4000, 10_000)).getName(), is("4000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(4090, 11_000)).getName(), is("4090&11_000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(6060)).getName(), is("6060+9090&99_000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(6060, 99_000)).getName(), is("6060+9090&99_000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(7070, 88_000)).getName(), is("N/A")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(10_000, 20_000, 30_000)).getName(), is("10_000&20_000&30_000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(10_000, 20_000)).getName(), is("N/A")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(4020)).getName(), is("4000")); assertThat(testee.fromResultNewznabCategories(Arrays.asList(9999)).getName(), is("N/A")); } | public Category fromResultNewznabCategories(List<Integer> cats) { if (cats == null || cats.size() == 0) { return naCategory; } cats.sort((o1, o2) -> Integer.compare(o2, o1)); return getMatchingCategoryOrMatchingMainCategory(cats, naCategory); } | CategoryProvider implements InitializingBean { public Category fromResultNewznabCategories(List<Integer> cats) { if (cats == null || cats.size() == 0) { return naCategory; } cats.sort((o1, o2) -> Integer.compare(o2, o1)); return getMatchingCategoryOrMatchingMainCategory(cats, naCategory); } } | CategoryProvider implements InitializingBean { public Category fromResultNewznabCategories(List<Integer> cats) { if (cats == null || cats.size() == 0) { return naCategory; } cats.sort((o1, o2) -> Integer.compare(o2, o1)); return getMatchingCategoryOrMatchingMainCategory(cats, naCategory); } CategoryProvider(); } | CategoryProvider implements InitializingBean { public Category fromResultNewznabCategories(List<Integer> cats) { if (cats == null || cats.size() == 0) { return naCategory; } cats.sort((o1, o2) -> Integer.compare(o2, o1)); return getMatchingCategoryOrMatchingMainCategory(cats, naCategory); } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); } | CategoryProvider implements InitializingBean { public Category fromResultNewznabCategories(List<Integer> cats) { if (cats == null || cats.size() == 0) { return naCategory; } cats.sort((o1, o2) -> Integer.compare(o2, o1)); return getMatchingCategoryOrMatchingMainCategory(cats, naCategory); } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); static final Category naCategory; } |
@Test public void testcheckCategoryMatchingMainCategory() { assertThat(testee.checkCategoryMatchingMainCategory(5030, 5000), is(true)); assertThat(testee.checkCategoryMatchingMainCategory(5000, 5000), is(true)); assertThat(testee.checkCategoryMatchingMainCategory(4030, 5000), is(false)); assertThat(testee.checkCategoryMatchingMainCategory(4000, 5000), is(false)); assertThat(testee.checkCategoryMatchingMainCategory(4030, 4030), is(false)); } | public static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat) { return possibleMainCat % 1000 == 0 && cat / 1000 == possibleMainCat / 1000; } | CategoryProvider implements InitializingBean { public static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat) { return possibleMainCat % 1000 == 0 && cat / 1000 == possibleMainCat / 1000; } } | CategoryProvider implements InitializingBean { public static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat) { return possibleMainCat % 1000 == 0 && cat / 1000 == possibleMainCat / 1000; } CategoryProvider(); } | CategoryProvider implements InitializingBean { public static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat) { return possibleMainCat % 1000 == 0 && cat / 1000 == possibleMainCat / 1000; } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); } | CategoryProvider implements InitializingBean { public static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat) { return possibleMainCat % 1000 == 0 && cat / 1000 == possibleMainCat / 1000; } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); static final Category naCategory; } |
@Test public void shouldFindBySubtype() { Optional<Category> animeOptional = testee.fromSubtype(Subtype.ANIME); assertThat(animeOptional.isPresent(), is(true)); assertThat(animeOptional.get().getName(), is("7020,8010")); Optional<Category> magazineOptional = testee.fromSubtype(Subtype.MAGAZINE); assertThat(magazineOptional.isPresent(), is(false)); } | public Optional<Category> fromSubtype(Subtype subtype) { return categories.stream().filter(x -> x.getSubtype() == subtype).findFirst(); } | CategoryProvider implements InitializingBean { public Optional<Category> fromSubtype(Subtype subtype) { return categories.stream().filter(x -> x.getSubtype() == subtype).findFirst(); } } | CategoryProvider implements InitializingBean { public Optional<Category> fromSubtype(Subtype subtype) { return categories.stream().filter(x -> x.getSubtype() == subtype).findFirst(); } CategoryProvider(); } | CategoryProvider implements InitializingBean { public Optional<Category> fromSubtype(Subtype subtype) { return categories.stream().filter(x -> x.getSubtype() == subtype).findFirst(); } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); } | CategoryProvider implements InitializingBean { public Optional<Category> fromSubtype(Subtype subtype) { return categories.stream().filter(x -> x.getSubtype() == subtype).findFirst(); } CategoryProvider(); @Override void afterPropertiesSet(); @org.springframework.context.event.EventListener void handleNewConfigEvent(ConfigChangedEvent newConfig); List<Category> getCategories(); void setCategories(List<Category> categories); Category getByInternalName(String name); Category getNotAvailable(); Category fromSearchNewznabCategories(String cats); Optional<Category> fromSubtype(Subtype subtype); Category fromSearchNewznabCategories(List<Integer> cats, Category defaultCategory); Category fromResultNewznabCategories(List<Integer> cats); static boolean checkCategoryMatchingMainCategory(int cat, int possibleMainCat); Category getMatchingCategoryOrMatchingMainCategory(List<Integer> cats, Category defaultCategory); static final Category naCategory; } |
@Test public void testHashCode() throws Exception { NewznabParameters testee1 = new NewznabParameters(); testee1.setQ("q"); NewznabParameters testee2 = new NewznabParameters(); testee2.setQ("q"); assertEquals(testee1.cacheKey(NewznabResponse.SearchType.TORZNAB), testee2.cacheKey(NewznabResponse.SearchType.TORZNAB)); assertNotEquals(testee1.cacheKey(NewznabResponse.SearchType.TORZNAB), testee2.cacheKey(NewznabResponse.SearchType.NEWZNAB)); testee2.setQ("anotherQ"); assertNotEquals(testee1.cacheKey(NewznabResponse.SearchType.TORZNAB), testee2.cacheKey(NewznabResponse.SearchType.TORZNAB)); } | @Override public int hashCode() { return Objects.hashCode(apikey, t, q, cat, rid, tvdbid, tvmazeid, traktId, imdbid, tmdbid, season, ep, author, title, offset, limit, minage, maxage, minsize, maxsize, id, raw, o, cachetime, genre, attrs, extended, password); } | NewznabParameters { @Override public int hashCode() { return Objects.hashCode(apikey, t, q, cat, rid, tvdbid, tvmazeid, traktId, imdbid, tmdbid, season, ep, author, title, offset, limit, minage, maxage, minsize, maxsize, id, raw, o, cachetime, genre, attrs, extended, password); } } | NewznabParameters { @Override public int hashCode() { return Objects.hashCode(apikey, t, q, cat, rid, tvdbid, tvmazeid, traktId, imdbid, tmdbid, season, ep, author, title, offset, limit, minage, maxage, minsize, maxsize, id, raw, o, cachetime, genre, attrs, extended, password); } } | NewznabParameters { @Override public int hashCode() { return Objects.hashCode(apikey, t, q, cat, rid, tvdbid, tvmazeid, traktId, imdbid, tmdbid, season, ep, author, title, offset, limit, minage, maxage, minsize, maxsize, id, raw, o, cachetime, genre, attrs, extended, password); } @Override String toString(); @Override boolean equals(Object o1); @Override int hashCode(); int cacheKey(NewznabResponse.SearchType searchType); } | NewznabParameters { @Override public int hashCode() { return Objects.hashCode(apikey, t, q, cat, rid, tvdbid, tvmazeid, traktId, imdbid, tmdbid, season, ep, author, title, offset, limit, minage, maxage, minsize, maxsize, id, raw, o, cachetime, genre, attrs, extended, password); } @Override String toString(); @Override boolean equals(Object o1); @Override int hashCode(); int cacheKey(NewznabResponse.SearchType searchType); } |
@Test public void shouldDetectThatTheSame() throws Exception { SearchResultItem item1 = new SearchResultItem(); setValues(item1, "1", "poster", "group", Instant.now()); SearchResultItem item2 = new SearchResultItem(); setValues(item2, "2", "poster", "group", Instant.now()); SearchResultItem item3 = new SearchResultItem(); setValues(item3, "3", "poster", "group", Instant.now()); DuplicateDetectionResult result = testee.detectDuplicates(Sets.newHashSet(item1, item2, item3)); assertThat(result.getDuplicateGroups().size()).isEqualTo(1); List<SearchResultItem> items = new ArrayList<>(result.getDuplicateGroups().get(0)); assertThat(items.get(0).getDuplicateIdentifier()).isEqualTo(items.get(1).getDuplicateIdentifier()).isEqualTo(items.get(2).getDuplicateIdentifier()); } | public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } |
@Test public void shouldWorkWithOneIndexerProvidingGroupAndPosterAndOneNot() throws Exception { SearchResultItem item1 = new SearchResultItem(); setValues(item1, "Indexer1", "[email protected]", "alt.binaries.triballs", Instant.ofEpochSecond(1447928064)); item1.setUsenetDate(item1.getPubDate()); item1.setSize(11565521038L); SearchResultItem item2 = new SearchResultItem(); setValues(item2, "Indexer1", "[email protected] (moovee)", "alt.binaries.moovee", Instant.ofEpochSecond(1447930279)); item2.setUsenetDate(item2.getPubDate()); item2.setSize(12100381412L); SearchResultItem item3 = new SearchResultItem(); setValues(item3, "Indexer1", "[email protected]", "alt.binaries.triballs", Instant.ofEpochSecond(1447927640)); item3.setUsenetDate(item3.getPubDate()); item3.setSize(11565520866L); SearchResultItem item4 = new SearchResultItem(); setValues(item4, "Indexer1", "[email protected] (moovee)", "alt.binaries.moovee", Instant.ofEpochSecond(1447930279)); item4.setUsenetDate(item4.getPubDate()); item4.setSize(12100382514L); SearchResultItem item5 = new SearchResultItem(); setValues(item5, "Indexer2", null, null, Instant.ofEpochSecond(1447973616)); item5.setSize(12096598793L); SearchResultItem item6 = new SearchResultItem(); setValues(item6, "Indexer2", null, null, Instant.ofEpochSecond(1447945386)); item6.setSize(12078310717L); SearchResultItem item7 = new SearchResultItem(); setValues(item7, "Indexer2", null, null, Instant.ofEpochSecond(1447930475)); item7.setSize(12099830939L); SearchResultItem item8 = new SearchResultItem(); setValues(item8, "Indexer2", null, null, Instant.ofEpochSecond(1447928088)); item8.setSize(11566348892L); HashSet<SearchResultItem> results = Sets.newHashSet(item1, item2, item3, item4, item5, item6, item7, item8); DuplicateDetectionResult result = testee.detectDuplicates(results); assertThat(result.getDuplicateGroups().size()).isEqualTo(6); assertThat(result.getDuplicateGroups().get(0).size()).isEqualTo(1); assertThat(result.getDuplicateGroups().get(1).size()).isEqualTo(1); assertThat(result.getDuplicateGroups().get(2).size()).isEqualTo(2); assertThat(result.getDuplicateGroups().get(3).size()).isEqualTo(1); assertThat(result.getDuplicateGroups().get(4).size()).isEqualTo(2); assertThat(result.getDuplicateGroups().get(5).size()).isEqualTo(1); } | public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } |
@Test public void duplicateIdsShouldBeSameForDuplicates() throws Exception { SearchResultItem item1 = new SearchResultItem(); setValues(item1, "1", "poster1", "group", Instant.now()); SearchResultItem item2 = new SearchResultItem(); setValues(item2, "2", "poster1", "group", Instant.now()); SearchResultItem item3 = new SearchResultItem(); setValues(item3, "3", "poster2", "group", Instant.now()); SearchResultItem item4 = new SearchResultItem(); setValues(item4, "4", "poster2", "group", Instant.now()); DuplicateDetectionResult result = testee.detectDuplicates(Sets.newHashSet(item1, item2, item3, item4)); assertThat(result.getDuplicateGroups().size()).isEqualTo(2); List<SearchResultItem> items = new ArrayList<>(result.getDuplicateGroups().get(0)); assertThat(items.get(0).getDuplicateIdentifier()).isEqualTo(items.get(1).getDuplicateIdentifier()).as("Duplicates should have the same duplicate identifiers"); items = new ArrayList<>(result.getDuplicateGroups().get(1)); assertThat(items.get(0).getDuplicateIdentifier()).isEqualTo(items.get(1).getDuplicateIdentifier()).as("Duplicates should have the same duplicate identifiers"); } | public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } | DuplicateDetector { public DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results) { Map<String, List<SearchResultItem>> groupedByTitle = results.stream().collect(Collectors.groupingBy(x -> x.getTitle().toLowerCase().replaceAll("[ .\\-_]", ""))); Multiset<Indexer> countUniqueResultsPerIndexer = HashMultiset.create(); List<LinkedHashSet<SearchResultItem>> duplicateGroups = new ArrayList<>(); int countDetectedDuplicates = 0; for (List<SearchResultItem> titleGroup : groupedByTitle.values()) { titleGroup = titleGroup.stream().sorted(Comparator.comparing(SearchResultItem::getBestDate).reversed()).collect(Collectors.toList()); List<LinkedHashSet<SearchResultItem>> listOfBuckets = new ArrayList<>(); listOfBuckets.add(new LinkedHashSet<>(newArrayList(titleGroup.get(0)))); for (int i = 1; i < titleGroup.size(); i++) { SearchResultItem searchResultItem = titleGroup.get(i); boolean foundBucket = false; for (LinkedHashSet<SearchResultItem> bucket : listOfBuckets) { if (bucket.stream().map(SearchResultItem::getIndexer).collect(Collectors.toList()).contains(searchResultItem.getIndexer())) { continue; } for (SearchResultItem other : bucket) { boolean same = testForSameness(searchResultItem, other); if (same) { foundBucket = true; bucket.add(searchResultItem); countDetectedDuplicates++; break; } } if (foundBucket) { break; } } if (!foundBucket) { listOfBuckets.add(new LinkedHashSet<>(newArrayList(searchResultItem))); } } LinkedHashSet<SearchResultItem> lastBucket = Iterables.getLast(listOfBuckets); if (lastBucket.size() == 1) { countUniqueResultsPerIndexer.add(lastBucket.iterator().next().getIndexer()); } duplicateGroups.addAll(listOfBuckets); } int duplicateIdentifier = 0; for (LinkedHashSet<SearchResultItem> group : duplicateGroups) { for (SearchResultItem x : group) { x.setDuplicateIdentifier(duplicateIdentifier); } duplicateIdentifier++; } logger.debug("Duplicate detection for {} search results found {} duplicates", results.size(), countDetectedDuplicates); return new DuplicateDetectionResult(duplicateGroups, countUniqueResultsPerIndexer, countDetectedDuplicates); } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } |
@Test public void shouldUseUsenetDateForComparison() throws Exception { SearchResultItem item1 = new SearchResultItem(); setValues(item1, "1", "poster1", "group", Instant.now()); item1.setPubDate(Instant.now().minus(100, ChronoUnit.DAYS)); SearchResultItem item2 = new SearchResultItem(); setValues(item2, "2", "poster1", "group", Instant.now()); item2.setPubDate(Instant.now().minus(300, ChronoUnit.DAYS)); item1.setUsenetDate(Instant.now()); item2.setUsenetDate(Instant.now()); assertThat(testee.testForDuplicateAge(item1, item2, 1F)).isTrue(); item2.setUsenetDate(null); assertThat(testee.testForDuplicateAge(item1, item2, 1F)).isFalse(); } | protected boolean testForDuplicateAge(SearchResultItem result1, SearchResultItem result2, float duplicateAgeThreshold) { Instant date1 = result1.getBestDate(); Instant date2 = result2.getBestDate(); if (date1 == null || date2 == null) { logger.debug(LoggingMarkers.DUPLICATES, "At least one result has no usenet date and no pub date"); return false; } boolean isSameAge = Math.abs(date1.getEpochSecond() - date2.getEpochSecond()) / (60 * 60) <= duplicateAgeThreshold; logger.debug(LoggingMarkers.DUPLICATES, "Same age: {}", isSameAge); return isSameAge; } | DuplicateDetector { protected boolean testForDuplicateAge(SearchResultItem result1, SearchResultItem result2, float duplicateAgeThreshold) { Instant date1 = result1.getBestDate(); Instant date2 = result2.getBestDate(); if (date1 == null || date2 == null) { logger.debug(LoggingMarkers.DUPLICATES, "At least one result has no usenet date and no pub date"); return false; } boolean isSameAge = Math.abs(date1.getEpochSecond() - date2.getEpochSecond()) / (60 * 60) <= duplicateAgeThreshold; logger.debug(LoggingMarkers.DUPLICATES, "Same age: {}", isSameAge); return isSameAge; } } | DuplicateDetector { protected boolean testForDuplicateAge(SearchResultItem result1, SearchResultItem result2, float duplicateAgeThreshold) { Instant date1 = result1.getBestDate(); Instant date2 = result2.getBestDate(); if (date1 == null || date2 == null) { logger.debug(LoggingMarkers.DUPLICATES, "At least one result has no usenet date and no pub date"); return false; } boolean isSameAge = Math.abs(date1.getEpochSecond() - date2.getEpochSecond()) / (60 * 60) <= duplicateAgeThreshold; logger.debug(LoggingMarkers.DUPLICATES, "Same age: {}", isSameAge); return isSameAge; } } | DuplicateDetector { protected boolean testForDuplicateAge(SearchResultItem result1, SearchResultItem result2, float duplicateAgeThreshold) { Instant date1 = result1.getBestDate(); Instant date2 = result2.getBestDate(); if (date1 == null || date2 == null) { logger.debug(LoggingMarkers.DUPLICATES, "At least one result has no usenet date and no pub date"); return false; } boolean isSameAge = Math.abs(date1.getEpochSecond() - date2.getEpochSecond()) / (60 * 60) <= duplicateAgeThreshold; logger.debug(LoggingMarkers.DUPLICATES, "Same age: {}", isSameAge); return isSameAge; } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } | DuplicateDetector { protected boolean testForDuplicateAge(SearchResultItem result1, SearchResultItem result2, float duplicateAgeThreshold) { Instant date1 = result1.getBestDate(); Instant date2 = result2.getBestDate(); if (date1 == null || date2 == null) { logger.debug(LoggingMarkers.DUPLICATES, "At least one result has no usenet date and no pub date"); return false; } boolean isSameAge = Math.abs(date1.getEpochSecond() - date2.getEpochSecond()) / (60 * 60) <= duplicateAgeThreshold; logger.debug(LoggingMarkers.DUPLICATES, "Same age: {}", isSameAge); return isSameAge; } DuplicateDetectionResult detectDuplicates(Set<SearchResultItem> results); } |
@Test public void setSearchResultDateRelatedValues() { SearchResultWebTOBuilder builder = SearchResultWebTO.builder(); SearchResultItem item = new SearchResultItem(); item.setPubDate(Instant.now().minus(100, ChronoUnit.DAYS)); item.setUsenetDate(Instant.now().minus(10, ChronoUnit.DAYS)); builder = testee.setSearchResultDateRelatedValues(builder, item); assertThat(builder.build().getAge()).isEqualTo("10d"); item.setUsenetDate(Instant.now().minus(10, ChronoUnit.HOURS)); builder = testee.setSearchResultDateRelatedValues(builder, item); assertThat(builder.build().getAge()).isEqualTo("10h"); item.setUsenetDate(Instant.now().minus(10, ChronoUnit.MINUTES)); builder = testee.setSearchResultDateRelatedValues(builder, item); assertThat(builder.build().getAge()).isEqualTo("10m"); item.setUsenetDate(null); builder = testee.setSearchResultDateRelatedValues(builder, item); assertThat(builder.build().getAge()).isEqualTo("100d"); } | protected SearchResultWebTOBuilder setSearchResultDateRelatedValues(SearchResultWebTOBuilder builder, SearchResultItem item) { Instant date = item.getBestDate(); long ageInDays = date.until(Instant.now(), ChronoUnit.DAYS); if (ageInDays > 0) { builder.age(ageInDays + "d"); } else { long ageInHours = date.until(Instant.now(), ChronoUnit.HOURS); if (ageInHours > 0) { builder.age(ageInHours + "h"); } else { long ageInMinutes = date.until(Instant.now(), ChronoUnit.MINUTES); builder.age(ageInMinutes + "m"); } } builder = builder .age_precise(item.isAgePrecise()) .date(LocalDateTime.ofInstant(date, ZoneId.of("UTC")).format(item.isAgePrecise() ? DATE_TIME_FORMATTER : DATE_FORMATTER)) .epoch(date.getEpochSecond()); return builder; } | InternalSearchResultProcessor { protected SearchResultWebTOBuilder setSearchResultDateRelatedValues(SearchResultWebTOBuilder builder, SearchResultItem item) { Instant date = item.getBestDate(); long ageInDays = date.until(Instant.now(), ChronoUnit.DAYS); if (ageInDays > 0) { builder.age(ageInDays + "d"); } else { long ageInHours = date.until(Instant.now(), ChronoUnit.HOURS); if (ageInHours > 0) { builder.age(ageInHours + "h"); } else { long ageInMinutes = date.until(Instant.now(), ChronoUnit.MINUTES); builder.age(ageInMinutes + "m"); } } builder = builder .age_precise(item.isAgePrecise()) .date(LocalDateTime.ofInstant(date, ZoneId.of("UTC")).format(item.isAgePrecise() ? DATE_TIME_FORMATTER : DATE_FORMATTER)) .epoch(date.getEpochSecond()); return builder; } } | InternalSearchResultProcessor { protected SearchResultWebTOBuilder setSearchResultDateRelatedValues(SearchResultWebTOBuilder builder, SearchResultItem item) { Instant date = item.getBestDate(); long ageInDays = date.until(Instant.now(), ChronoUnit.DAYS); if (ageInDays > 0) { builder.age(ageInDays + "d"); } else { long ageInHours = date.until(Instant.now(), ChronoUnit.HOURS); if (ageInHours > 0) { builder.age(ageInHours + "h"); } else { long ageInMinutes = date.until(Instant.now(), ChronoUnit.MINUTES); builder.age(ageInMinutes + "m"); } } builder = builder .age_precise(item.isAgePrecise()) .date(LocalDateTime.ofInstant(date, ZoneId.of("UTC")).format(item.isAgePrecise() ? DATE_TIME_FORMATTER : DATE_FORMATTER)) .epoch(date.getEpochSecond()); return builder; } } | InternalSearchResultProcessor { protected SearchResultWebTOBuilder setSearchResultDateRelatedValues(SearchResultWebTOBuilder builder, SearchResultItem item) { Instant date = item.getBestDate(); long ageInDays = date.until(Instant.now(), ChronoUnit.DAYS); if (ageInDays > 0) { builder.age(ageInDays + "d"); } else { long ageInHours = date.until(Instant.now(), ChronoUnit.HOURS); if (ageInHours > 0) { builder.age(ageInHours + "h"); } else { long ageInMinutes = date.until(Instant.now(), ChronoUnit.MINUTES); builder.age(ageInMinutes + "m"); } } builder = builder .age_precise(item.isAgePrecise()) .date(LocalDateTime.ofInstant(date, ZoneId.of("UTC")).format(item.isAgePrecise() ? DATE_TIME_FORMATTER : DATE_FORMATTER)) .epoch(date.getEpochSecond()); return builder; } SearchResponse createSearchResponse(org.nzbhydra.searching.SearchResult searchResult); } | InternalSearchResultProcessor { protected SearchResultWebTOBuilder setSearchResultDateRelatedValues(SearchResultWebTOBuilder builder, SearchResultItem item) { Instant date = item.getBestDate(); long ageInDays = date.until(Instant.now(), ChronoUnit.DAYS); if (ageInDays > 0) { builder.age(ageInDays + "d"); } else { long ageInHours = date.until(Instant.now(), ChronoUnit.HOURS); if (ageInHours > 0) { builder.age(ageInHours + "h"); } else { long ageInMinutes = date.until(Instant.now(), ChronoUnit.MINUTES); builder.age(ageInMinutes + "m"); } } builder = builder .age_precise(item.isAgePrecise()) .date(LocalDateTime.ofInstant(date, ZoneId.of("UTC")).format(item.isAgePrecise() ? DATE_TIME_FORMATTER : DATE_FORMATTER)) .epoch(date.getEpochSecond()); return builder; } SearchResponse createSearchResponse(org.nzbhydra.searching.SearchResult searchResult); } |
@Test public void shouldNotRunWhenNotEnabled() { testee.queueCheckEnabled = false; testee.lastDownload = Instant.now(); testee.checkStatus(Collections.singletonList(FileDownloadStatus.REQUESTED), 10000, StatusCheckType.QUEUE); verifyNoMoreInteractions(downloadRepository); } | protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } |
@Test public void shouldNotRunWhenLastDownloadTooLongGone() { testee.queueCheckEnabled = true; testee.lastDownload = Instant.ofEpochSecond(1L); testee.checkStatus(Collections.singletonList(FileDownloadStatus.REQUESTED), 10000, StatusCheckType.HISTORY); verifyNoMoreInteractions(downloadRepository); } | protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } |
@Test public void shouldSetDisabledAndNotRunIfNoDownloadsInDatabase() { testee.historyCheckEnabled = true; testee.lastDownload = Instant.now(); List<FileDownloadStatus> statuses = Collections.singletonList(FileDownloadStatus.REQUESTED); when(downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(eq(statuses), any())).thenReturn(Collections.emptyList()); testee.checkStatus(statuses, 10000, StatusCheckType.HISTORY); assertThat(testee.historyCheckEnabled).isFalse(); } | protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } |
@Test public void shouldCallDownloader() { testee.historyCheckEnabled = true; testee.lastDownload = Instant.now(); List<FileDownloadStatus> statuses = Collections.singletonList(FileDownloadStatus.REQUESTED); List<FileDownloadEntity> downloadsWaitingForUpdate = Collections.singletonList(new FileDownloadEntity()); when(downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(eq(statuses), any())).thenReturn(downloadsWaitingForUpdate); List<FileDownloadEntity> downloadsReturnedFromDownloader = Collections.singletonList(new FileDownloadEntity()); when(downloaderMock.checkForStatusUpdates(any(),eq(StatusCheckType.HISTORY))).thenReturn(downloadsReturnedFromDownloader); testee.checkStatus(statuses, 10000, StatusCheckType.HISTORY); verify(downloaderMock).checkForStatusUpdates(downloadsWaitingForUpdate, StatusCheckType.HISTORY); verify(downloadRepository).saveAll(downloadsReturnedFromDownloader); } | protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } | DownloadStatusUpdater { protected void checkStatus(List<FileDownloadStatus> nzbDownloadStatuses, long maxAgeDownloadEntitiesInSeconds, StatusCheckType statusCheckType) { if ((!queueCheckEnabled && statusCheckType == StatusCheckType.QUEUE) || (!historyCheckEnabled && statusCheckType == StatusCheckType.HISTORY)) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because it's disabled", statusCheckType); return; } if (lastDownload.isBefore(Instant.now().minusSeconds(MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES))) { logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Not executing {} status update because last download was {}", statusCheckType, lastDownload); return; } List<FileDownloadEntity> downloadsWaitingForUpdate = downloadRepository.findByStatusInAndTimeAfterOrderByTimeDesc(nzbDownloadStatuses, Instant.now().minusSeconds(maxAgeDownloadEntitiesInSeconds)); if (downloadsWaitingForUpdate.isEmpty()) { if (statusCheckType == StatusCheckType.QUEUE) { queueCheckEnabled = false; } else { historyCheckEnabled = false; } logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Returning and setting {} status update disabled because no current downloads are waiting for updates", statusCheckType); return; } List<FileDownloadEntity> updatedDownloads = new ArrayList<>(); logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "{} downloads waiting for {} update", downloadsWaitingForUpdate.size(), statusCheckType); for (Downloader downloader : downloaderProvider.getAllDownloaders()) { if (downloader.isEnabled()) { updatedDownloads.addAll(downloader.checkForStatusUpdates(downloadsWaitingForUpdate, statusCheckType)); } } downloadRepository.saveAll(updatedDownloads); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } |
@Test public void shouldSetEnabledOnDownloadEvent() { testee.queueCheckEnabled = false; testee.lastDownload = null; testee.onNzbDownloadEvent(new FileDownloadEvent(new FileDownloadEntity(), new SearchResultEntity())); assertThat(testee.queueCheckEnabled).isTrue(); assertThat(testee.lastDownload).isNotNull(); } | @EventListener public void onNzbDownloadEvent(FileDownloadEvent downloadEvent) { if (!configProvider.getBaseConfig().getMain().isKeepHistory()) { return; } lastDownload = Instant.now(); queueCheckEnabled = true; historyCheckEnabled = true; logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Received download event. Will enable status updates for the next {} minutes", (MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES / 60)); } | DownloadStatusUpdater { @EventListener public void onNzbDownloadEvent(FileDownloadEvent downloadEvent) { if (!configProvider.getBaseConfig().getMain().isKeepHistory()) { return; } lastDownload = Instant.now(); queueCheckEnabled = true; historyCheckEnabled = true; logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Received download event. Will enable status updates for the next {} minutes", (MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES / 60)); } } | DownloadStatusUpdater { @EventListener public void onNzbDownloadEvent(FileDownloadEvent downloadEvent) { if (!configProvider.getBaseConfig().getMain().isKeepHistory()) { return; } lastDownload = Instant.now(); queueCheckEnabled = true; historyCheckEnabled = true; logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Received download event. Will enable status updates for the next {} minutes", (MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES / 60)); } } | DownloadStatusUpdater { @EventListener public void onNzbDownloadEvent(FileDownloadEvent downloadEvent) { if (!configProvider.getBaseConfig().getMain().isKeepHistory()) { return; } lastDownload = Instant.now(); queueCheckEnabled = true; historyCheckEnabled = true; logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Received download event. Will enable status updates for the next {} minutes", (MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES / 60)); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } | DownloadStatusUpdater { @EventListener public void onNzbDownloadEvent(FileDownloadEvent downloadEvent) { if (!configProvider.getBaseConfig().getMain().isKeepHistory()) { return; } lastDownload = Instant.now(); queueCheckEnabled = true; historyCheckEnabled = true; logger.debug(LoggingMarkers.DOWNLOAD_STATUS_UPDATE, "Received download event. Will enable status updates for the next {} minutes", (MIN_SECONDS_SINCE_LAST_DOWNLOAD_TO_CHECK_STATUSES / 60)); } @HydraTask(configId = "downloadHistoryCheck", name = "Download history check", interval = TEN_MINUTES_MS) @Transactional void checkHistoryStatus(); @HydraTask(configId = "downloadQueueCheck", name = "Download queue check", interval = TEN_SECONDS_MS) @Transactional void checkQueueStatus(); @EventListener void onNzbDownloadEvent(FileDownloadEvent downloadEvent); } |
@Test public void testBuilder() { NewznabXmlItem item = RssItemBuilder.builder("title") .group("group") .poster("poster") .size(1000L) .category("category") .categoryNewznab("5000") .description("desc") .link("link") .hasNfo(true) .grabs(10).build(); Map<String, String> attributes = item.getNewznabAttributes().stream().collect(Collectors.toMap(NewznabAttribute::getName, NewznabAttribute::getValue)); assertEquals("group", attributes.get("group")); assertEquals("poster", attributes.get("poster")); assertEquals("5000", attributes.get("category")); assertEquals("1", attributes.get("nfo")); assertEquals(Long.valueOf(1000), item.getEnclosure().getLength()); assertEquals("desc", item.getDescription()); assertEquals("category", item.getCategory()); assertEquals("link", item.getEnclosure().getUrl()); } | public static RssItemBuilder builder() { RssItemBuilder builder = new RssItemBuilder(); return builder; } | RssItemBuilder { public static RssItemBuilder builder() { RssItemBuilder builder = new RssItemBuilder(); return builder; } } | RssItemBuilder { public static RssItemBuilder builder() { RssItemBuilder builder = new RssItemBuilder(); return builder; } private RssItemBuilder(); } | RssItemBuilder { public static RssItemBuilder builder() { RssItemBuilder builder = new RssItemBuilder(); return builder; } private RssItemBuilder(); static RssItemBuilder builder(); static RssItemBuilder builder(String title); RssItemBuilder title(String title); RssItemBuilder link(String link); RssItemBuilder size(long size); RssItemBuilder pubDate(Instant pubDate); RssItemBuilder rssGuid(NewznabXmlGuid rssGuid); RssItemBuilder description(String description); RssItemBuilder comments(String comments); RssItemBuilder category(String category); RssItemBuilder grabs(Integer grabs); RssItemBuilder newznabAttributes(List<NewznabAttribute> newznabAttributes); RssItemBuilder torznabAttributes(List<NewznabAttribute> torznabAttributes); RssItemBuilder enclosure(NewznabXmlEnclosure enclosure); RssItemBuilder hasNfo(boolean hasNfo); RssItemBuilder poster(String poster); RssItemBuilder group(String group); RssItemBuilder linksFromBaseUrl(String baseUrl); RssItemBuilder categoryNewznab(String... categories); NewznabXmlItem build(); } | RssItemBuilder { public static RssItemBuilder builder() { RssItemBuilder builder = new RssItemBuilder(); return builder; } private RssItemBuilder(); static RssItemBuilder builder(); static RssItemBuilder builder(String title); RssItemBuilder title(String title); RssItemBuilder link(String link); RssItemBuilder size(long size); RssItemBuilder pubDate(Instant pubDate); RssItemBuilder rssGuid(NewznabXmlGuid rssGuid); RssItemBuilder description(String description); RssItemBuilder comments(String comments); RssItemBuilder category(String category); RssItemBuilder grabs(Integer grabs); RssItemBuilder newznabAttributes(List<NewznabAttribute> newznabAttributes); RssItemBuilder torznabAttributes(List<NewznabAttribute> torznabAttributes); RssItemBuilder enclosure(NewznabXmlEnclosure enclosure); RssItemBuilder hasNfo(boolean hasNfo); RssItemBuilder poster(String poster); RssItemBuilder group(String group); RssItemBuilder linksFromBaseUrl(String baseUrl); RssItemBuilder categoryNewznab(String... categories); NewznabXmlItem build(); } |
@Test public void getDownloadingRatesInKilobytes() { List<Long> list = new ArrayList<>(Arrays.asList(100L, 100L, 100L, 100L, 100L, 100L, 100L)); testee.setDownloadingRatesInKilobytes(list); assertThat(testee.getDownloadingRatesInKilobytes()).containsExactlyElementsOf(list); list = new ArrayList<>(Arrays.asList(100L, 100L, 100L, 100L, 100L, 100L, 100L, 50000L)); testee.setDownloadingRatesInKilobytes(list); assertThat(testee.getDownloadingRatesInKilobytes()).containsExactly(100L, 100L, 100L, 100L, 100L, 100L, 100L); list = new ArrayList<>(Arrays.asList(100L, 100L, 100L, 100L, 100L, 100L, 100L, 50000L, 50000L)); testee.setDownloadingRatesInKilobytes(list); assertThat(testee.getDownloadingRatesInKilobytes()).containsExactlyElementsOf(list); } | public List<Long> getDownloadingRatesInKilobytes() { if (downloadingRatesInKilobytes.isEmpty() || downloadingRatesInKilobytes.size() < 5) { return downloadingRatesInKilobytes; } if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 2)) { if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 3)) { return downloadingRatesInKilobytes.subList(0, downloadingRatesInKilobytes.size() - 1); } } return downloadingRatesInKilobytes; } | DownloaderStatus { public List<Long> getDownloadingRatesInKilobytes() { if (downloadingRatesInKilobytes.isEmpty() || downloadingRatesInKilobytes.size() < 5) { return downloadingRatesInKilobytes; } if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 2)) { if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 3)) { return downloadingRatesInKilobytes.subList(0, downloadingRatesInKilobytes.size() - 1); } } return downloadingRatesInKilobytes; } } | DownloaderStatus { public List<Long> getDownloadingRatesInKilobytes() { if (downloadingRatesInKilobytes.isEmpty() || downloadingRatesInKilobytes.size() < 5) { return downloadingRatesInKilobytes; } if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 2)) { if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 3)) { return downloadingRatesInKilobytes.subList(0, downloadingRatesInKilobytes.size() - 1); } } return downloadingRatesInKilobytes; } } | DownloaderStatus { public List<Long> getDownloadingRatesInKilobytes() { if (downloadingRatesInKilobytes.isEmpty() || downloadingRatesInKilobytes.size() < 5) { return downloadingRatesInKilobytes; } if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 2)) { if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 3)) { return downloadingRatesInKilobytes.subList(0, downloadingRatesInKilobytes.size() - 1); } } return downloadingRatesInKilobytes; } Long getLastDownloadRate(); String getDownloadRateFormatted(); String getRemainingSizeFormatted(); List<Long> getDownloadingRatesInKilobytes(); } | DownloaderStatus { public List<Long> getDownloadingRatesInKilobytes() { if (downloadingRatesInKilobytes.isEmpty() || downloadingRatesInKilobytes.size() < 5) { return downloadingRatesInKilobytes; } if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 2)) { if (downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 1) / (float) 10 > downloadingRatesInKilobytes.get(downloadingRatesInKilobytes.size() - 3)) { return downloadingRatesInKilobytes.subList(0, downloadingRatesInKilobytes.size() - 1); } } return downloadingRatesInKilobytes; } Long getLastDownloadRate(); String getDownloadRateFormatted(); String getRemainingSizeFormatted(); List<Long> getDownloadingRatesInKilobytes(); } |
@Ignore @Test public void executeCheck() throws Exception { MockitoAnnotations.initMocks(this); final Path tempFile = Files.createTempFile("nzbhydra", ".log"); try { tempFile.toFile().delete(); Files.copy(getClass().getResourceAsStream("logWithOom.log"), tempFile); } catch (Exception e) { return; } when(logContentProviderMock.getCurrentLogfile(false)).thenReturn(tempFile.toFile()); testee.executeCheck(); verify(genericStorageMock, times(4)).save(stringArgumentCaptor.capture(), objectArgumentCaptor.capture()); assertThat(stringArgumentCaptor.getAllValues().get(0)).isEqualTo("outOfMemoryDetected-2018-11-09 00:17:46 database: close"); assertThat(stringArgumentCaptor.getAllValues().get(1)).isEqualTo("outOfMemoryDetected"); assertThat(stringArgumentCaptor.getAllValues().get(2)).isEqualTo("outOfMemoryDetected-2018-11-09 11:11:46 database: close"); assertThat(stringArgumentCaptor.getAllValues().get(3)).isEqualTo("outOfMemoryDetected"); assertThat(objectArgumentCaptor.getAllValues().get(0)).isEqualTo(true); assertThat(objectArgumentCaptor.getAllValues().get(1)).isEqualTo(true); } | @Override public void executeCheck() { try { AtomicReference<State> state = new AtomicReference<>(); state.set(State.LOOKING_FOR_OOM); AtomicReference<String> lastTimeStampLine = new AtomicReference<>(); Files.lines(logContentProvider.getCurrentLogfile(false).toPath()).forEach(line -> { if (line.matches("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.*")) { if (state.get() == State.LOOKING_FOR_OOM) { lastTimeStampLine.set(line); } if (state.get() == State.LOOKING_FOR_OOM_END) { state.set(State.LOOKING_FOR_OOM); } return; } if (line.contains("java.lang.OutOfMemoryError")) { if (state.get() == State.LOOKING_FOR_OOM) { String key = "outOfMemoryDetected-" + lastTimeStampLine.get(); boolean alreadyDetected = genericStorage.get(key, String.class).isPresent(); if (!alreadyDetected) { logger.warn("The log indicates that the process ran out of memory. Please increase the XMX value in the main config and restart."); genericStorage.save(key, true); genericStorage.save("outOfMemoryDetected", true); } state.set(State.LOOKING_FOR_OOM_END); } } }); } catch (IOException e) { logger.warn("Unable to read log file: " + e.getMessage()); } catch (Exception e) { logger.warn("Unable to detect problems in log file", e); } } | OutOfMemoryDetector implements ProblemDetector { @Override public void executeCheck() { try { AtomicReference<State> state = new AtomicReference<>(); state.set(State.LOOKING_FOR_OOM); AtomicReference<String> lastTimeStampLine = new AtomicReference<>(); Files.lines(logContentProvider.getCurrentLogfile(false).toPath()).forEach(line -> { if (line.matches("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.*")) { if (state.get() == State.LOOKING_FOR_OOM) { lastTimeStampLine.set(line); } if (state.get() == State.LOOKING_FOR_OOM_END) { state.set(State.LOOKING_FOR_OOM); } return; } if (line.contains("java.lang.OutOfMemoryError")) { if (state.get() == State.LOOKING_FOR_OOM) { String key = "outOfMemoryDetected-" + lastTimeStampLine.get(); boolean alreadyDetected = genericStorage.get(key, String.class).isPresent(); if (!alreadyDetected) { logger.warn("The log indicates that the process ran out of memory. Please increase the XMX value in the main config and restart."); genericStorage.save(key, true); genericStorage.save("outOfMemoryDetected", true); } state.set(State.LOOKING_FOR_OOM_END); } } }); } catch (IOException e) { logger.warn("Unable to read log file: " + e.getMessage()); } catch (Exception e) { logger.warn("Unable to detect problems in log file", e); } } } | OutOfMemoryDetector implements ProblemDetector { @Override public void executeCheck() { try { AtomicReference<State> state = new AtomicReference<>(); state.set(State.LOOKING_FOR_OOM); AtomicReference<String> lastTimeStampLine = new AtomicReference<>(); Files.lines(logContentProvider.getCurrentLogfile(false).toPath()).forEach(line -> { if (line.matches("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.*")) { if (state.get() == State.LOOKING_FOR_OOM) { lastTimeStampLine.set(line); } if (state.get() == State.LOOKING_FOR_OOM_END) { state.set(State.LOOKING_FOR_OOM); } return; } if (line.contains("java.lang.OutOfMemoryError")) { if (state.get() == State.LOOKING_FOR_OOM) { String key = "outOfMemoryDetected-" + lastTimeStampLine.get(); boolean alreadyDetected = genericStorage.get(key, String.class).isPresent(); if (!alreadyDetected) { logger.warn("The log indicates that the process ran out of memory. Please increase the XMX value in the main config and restart."); genericStorage.save(key, true); genericStorage.save("outOfMemoryDetected", true); } state.set(State.LOOKING_FOR_OOM_END); } } }); } catch (IOException e) { logger.warn("Unable to read log file: " + e.getMessage()); } catch (Exception e) { logger.warn("Unable to detect problems in log file", e); } } } | OutOfMemoryDetector implements ProblemDetector { @Override public void executeCheck() { try { AtomicReference<State> state = new AtomicReference<>(); state.set(State.LOOKING_FOR_OOM); AtomicReference<String> lastTimeStampLine = new AtomicReference<>(); Files.lines(logContentProvider.getCurrentLogfile(false).toPath()).forEach(line -> { if (line.matches("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.*")) { if (state.get() == State.LOOKING_FOR_OOM) { lastTimeStampLine.set(line); } if (state.get() == State.LOOKING_FOR_OOM_END) { state.set(State.LOOKING_FOR_OOM); } return; } if (line.contains("java.lang.OutOfMemoryError")) { if (state.get() == State.LOOKING_FOR_OOM) { String key = "outOfMemoryDetected-" + lastTimeStampLine.get(); boolean alreadyDetected = genericStorage.get(key, String.class).isPresent(); if (!alreadyDetected) { logger.warn("The log indicates that the process ran out of memory. Please increase the XMX value in the main config and restart."); genericStorage.save(key, true); genericStorage.save("outOfMemoryDetected", true); } state.set(State.LOOKING_FOR_OOM_END); } } }); } catch (IOException e) { logger.warn("Unable to read log file: " + e.getMessage()); } catch (Exception e) { logger.warn("Unable to detect problems in log file", e); } } @Override void executeCheck(); } | OutOfMemoryDetector implements ProblemDetector { @Override public void executeCheck() { try { AtomicReference<State> state = new AtomicReference<>(); state.set(State.LOOKING_FOR_OOM); AtomicReference<String> lastTimeStampLine = new AtomicReference<>(); Files.lines(logContentProvider.getCurrentLogfile(false).toPath()).forEach(line -> { if (line.matches("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.*")) { if (state.get() == State.LOOKING_FOR_OOM) { lastTimeStampLine.set(line); } if (state.get() == State.LOOKING_FOR_OOM_END) { state.set(State.LOOKING_FOR_OOM); } return; } if (line.contains("java.lang.OutOfMemoryError")) { if (state.get() == State.LOOKING_FOR_OOM) { String key = "outOfMemoryDetected-" + lastTimeStampLine.get(); boolean alreadyDetected = genericStorage.get(key, String.class).isPresent(); if (!alreadyDetected) { logger.warn("The log indicates that the process ran out of memory. Please increase the XMX value in the main config and restart."); genericStorage.save(key, true); genericStorage.save("outOfMemoryDetected", true); } state.set(State.LOOKING_FOR_OOM_END); } } }); } catch (IOException e) { logger.warn("Unable to read log file: " + e.getMessage()); } catch (Exception e) { logger.warn("Unable to detect problems in log file", e); } } @Override void executeCheck(); } |
@Test public void shouldCreateBackupIfEnabledAndNoBackupExecutedYet() throws Exception { when(genericStorage.get("FirstStart", LocalDateTime.class)).thenReturn(Optional.of(LocalDateTime.now(testee.clock).minus(200, ChronoUnit.DAYS))); testee.createBackup(); verify(backupAndRestore).backup(); verify(genericStorage).save(eq("BackupData"), backupDataArgumentCaptor.capture()); BackupData backupData = backupDataArgumentCaptor.getValue(); assertThat(backupData.getLastBackup(), is(LocalDateTime.now(testee.clock))); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldCreateBackupIfEnabledAndLastBackupAndStartupWasNotToday() throws Exception { when(genericStorage.get("FirstStart", LocalDateTime.class)).thenReturn(Optional.of(LocalDateTime.now(testee.clock).minus(200, ChronoUnit.DAYS))); when(genericStorage.get(BackupTask.KEY, BackupData.class)).thenReturn(Optional.of(new BackupData(LocalDateTime.now(testee.clock).minus(8, ChronoUnit.DAYS)))); testee.createBackup(); verify(backupAndRestore).backup(); verify(genericStorage).save(eq("BackupData"), backupDataArgumentCaptor.capture()); BackupData backupData = backupDataArgumentCaptor.getValue(); assertThat(backupData.getLastBackup(), is(LocalDateTime.now(testee.clock))); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldNotCreateBackupIfEnabledAndLastBackupWasTooRecently() throws Exception { when(genericStorage.get("FirstStart", LocalDateTime.class)).thenReturn(Optional.of(LocalDateTime.now(testee.clock).minus(200, ChronoUnit.DAYS))); when(genericStorage.get(BackupTask.KEY, BackupData.class)).thenReturn(Optional.of(new BackupData(LocalDateTime.now(testee.clock).minus(5, ChronoUnit.DAYS)))); testee.createBackup(); verify(backupAndRestore, never()).backup(); verify(genericStorage, never()).save(eq("BackupData"), backupDataArgumentCaptor.capture()); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldNotCreateBackupIfDisabled() throws Exception { config.getMain().setBackupEveryXDays(null); testee.createBackup(); verify(backupAndRestore, never()).backup(); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldNotCreateBackupIfStartedToday() throws Exception { when(genericStorage.get("FirstStart", LocalDateTime.class)).thenReturn(Optional.of(LocalDateTime.now(testee.clock))); testee.createBackup(); verify(backupAndRestore, never()).backup(); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldNotCreateBackupIfLastBackupWasToday() throws Exception { when(genericStorage.get("BackupData", BackupData.class)).thenReturn(Optional.of(new BackupData(LocalDateTime.now(testee.clock)))); testee.createBackup(); verify(backupAndRestore, never()).backup(); } | @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); } | BackupTask { @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) public void createBackup() { boolean backupEnabled = configProvider.getBaseConfig().getMain().getBackupEveryXDays().isPresent(); if (!backupEnabled) { logger.debug("Automatic backup is disabled"); return; } int backupEveryXDays = configProvider.getBaseConfig().getMain().getBackupEveryXDays().get(); Optional<LocalDateTime> firstStartOptional = genericStorage.get("FirstStart", LocalDateTime.class); if (!firstStartOptional.isPresent()) { logger.debug("First start date time not set (for some reason), aborting backup"); return; } long daysSinceFirstStart = ChronoUnit.DAYS.between(firstStartOptional.get(), LocalDateTime.now(clock)); if (daysSinceFirstStart < backupEveryXDays) { logger.debug("{} days since first start but backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); return; } Optional<BackupData> backupData = genericStorage.get(KEY, BackupData.class); if (!backupData.isPresent()) { logger.debug("Executing first backup: {} days since first start and backup is to be executed every {} days", daysSinceFirstStart, backupEveryXDays); executeBackup(); return; } long daysSinceLastBackup = ChronoUnit.DAYS.between(backupData.get().getLastBackup(), LocalDateTime.now(clock)); if (daysSinceLastBackup >= backupEveryXDays) { logger.debug("Executing backup: {} days since last backup and backup is to be executed every {} days", daysSinceLastBackup, backupEveryXDays); executeBackup(); } } @HydraTask(configId = "Backup", name = "Backup", interval = HOUR) void createBackup(); static final String KEY; } |
@Test public void shouldRemoveSensitiveData() { SensitiveDataRemovingPatternLayoutEncoder encoder = new SensitiveDataRemovingPatternLayoutEncoder(); String result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("http: assertThat(result).isEqualTo("http: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: result = encoder.removeSensitiveData("https: assertThat(result).isEqualTo("https: final String darrApiKeyField = " \"name\": \"apiKey\",\n" + " \"label\": \"API Key\",\n" + " \"value\": \"12345678\","; result = encoder.removeSensitiveData(darrApiKeyField); assertThat(result).isEqualTo(darrApiKeyField.replace("12345678", "<apikey>")); final String darrUrlField = " \"name\": \"baseUrl\",\n" + " \"label\": \"URL\",\n" + " \"value\": \"http: result = encoder.removeSensitiveData(darrUrlField); assertThat(result).isEqualTo(darrUrlField.replace("http: final String darrUrlField2 = "\"name\" : \"baseUrl\",\n" + " \"value\" : \"http: result = encoder.removeSensitiveData(darrUrlField2); assertThat(result).isEqualTo(darrUrlField2.replace("http: final String darrUrlField3 = "\"name\" : \"baseUrl\",\n" + " \"value\" : \"http: result = encoder.removeSensitiveData(darrUrlField3); assertThat(result).isEqualTo(darrUrlField3.replace("http: } | protected String removeSensitiveData(String txt) { return txt.replaceAll("(?i)(username|apikey|password)(=|:|%3D)([^&\\s]{2,})", "$1$2<$1>") .replaceAll("(\"name\" ?: ?\"apiKey\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<apikey>") .replaceAll("(\"name\" ?: ?\"baseUrl\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<url>") ; } | SensitiveDataRemovingPatternLayoutEncoder extends PatternLayoutEncoder { protected String removeSensitiveData(String txt) { return txt.replaceAll("(?i)(username|apikey|password)(=|:|%3D)([^&\\s]{2,})", "$1$2<$1>") .replaceAll("(\"name\" ?: ?\"apiKey\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<apikey>") .replaceAll("(\"name\" ?: ?\"baseUrl\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<url>") ; } } | SensitiveDataRemovingPatternLayoutEncoder extends PatternLayoutEncoder { protected String removeSensitiveData(String txt) { return txt.replaceAll("(?i)(username|apikey|password)(=|:|%3D)([^&\\s]{2,})", "$1$2<$1>") .replaceAll("(\"name\" ?: ?\"apiKey\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<apikey>") .replaceAll("(\"name\" ?: ?\"baseUrl\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<url>") ; } } | SensitiveDataRemovingPatternLayoutEncoder extends PatternLayoutEncoder { protected String removeSensitiveData(String txt) { return txt.replaceAll("(?i)(username|apikey|password)(=|:|%3D)([^&\\s]{2,})", "$1$2<$1>") .replaceAll("(\"name\" ?: ?\"apiKey\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<apikey>") .replaceAll("(\"name\" ?: ?\"baseUrl\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<url>") ; } Charset getCharset(); void setCharset(Charset charset); byte[] encode(ILoggingEvent event); } | SensitiveDataRemovingPatternLayoutEncoder extends PatternLayoutEncoder { protected String removeSensitiveData(String txt) { return txt.replaceAll("(?i)(username|apikey|password)(=|:|%3D)([^&\\s]{2,})", "$1$2<$1>") .replaceAll("(\"name\" ?: ?\"apiKey\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<apikey>") .replaceAll("(\"name\" ?: ?\"baseUrl\",(\\s*\"label\": ?\".*\",)?\\s*\"value\" ?: \")([^\"\\s*]*)", "$1<url>") ; } Charset getCharset(); void setCharset(Charset charset); byte[] encode(ILoggingEvent event); } |
@Test public void shouldAnonymizeIPs() throws Exception { String toAnonymize = "192.168.0.1 127.0.0.1 2001:db8:3:4:: 64:ff9b:: 2001:db8:a0b:12f0::1 2001:0db8:0a0b:12f0:0000:0000:0000:0001"; String anonymized = testee.getAnonymizedLog(toAnonymize); Arrays.stream(toAnonymize.split(" ")).skip(2).forEach(x -> { Assertions.assertThat(anonymized).doesNotContain(x); }); Assertions.assertThat(anonymized).contains("192.168.0.1"); Assertions.assertThat(anonymized).contains("<localhost>"); } | public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } |
@Test public void shouldCheckIfSelectedByUser() { when(searchModuleProviderMock.getIndexers()).thenReturn(Arrays.asList(indexer)); when(searchRequest.getSource()).thenReturn(SearchSource.INTERNAL); when(searchRequest.getIndexers()).thenReturn(Optional.of(Sets.newSet("anotherIndexer"))); assertFalse(testee.checkIndexerSelectedByUser(indexer)); when(searchRequest.getSource()).thenReturn(SearchSource.API); assertFalse(testee.checkIndexerSelectedByUser(indexer)); when(searchRequest.getIndexers()).thenReturn(Optional.of(Sets.newSet("indexer"))); when(searchRequest.getSource()).thenReturn(SearchSource.INTERNAL); assertTrue(testee.checkIndexerSelectedByUser(indexer)); when(searchRequest.getSource()).thenReturn(SearchSource.API); assertTrue(testee.checkIndexerSelectedByUser(indexer)); } | protected boolean checkIndexerSelectedByUser(Indexer indexer) { boolean indexerNotSelectedByUser = (searchRequest.getIndexers().isPresent() && !searchRequest.getIndexers().get().isEmpty()) && !searchRequest.getIndexers().get().contains(indexer.getName()); if (indexerNotSelectedByUser) { logger.info(String.format("Not using %s because it was not selected by the user", indexer.getName())); notSelectedIndersWithReason.put(indexer, "Not selected by the user"); return false; } return true; } | IndexerForSearchSelector { protected boolean checkIndexerSelectedByUser(Indexer indexer) { boolean indexerNotSelectedByUser = (searchRequest.getIndexers().isPresent() && !searchRequest.getIndexers().get().isEmpty()) && !searchRequest.getIndexers().get().contains(indexer.getName()); if (indexerNotSelectedByUser) { logger.info(String.format("Not using %s because it was not selected by the user", indexer.getName())); notSelectedIndersWithReason.put(indexer, "Not selected by the user"); return false; } return true; } } | IndexerForSearchSelector { protected boolean checkIndexerSelectedByUser(Indexer indexer) { boolean indexerNotSelectedByUser = (searchRequest.getIndexers().isPresent() && !searchRequest.getIndexers().get().isEmpty()) && !searchRequest.getIndexers().get().contains(indexer.getName()); if (indexerNotSelectedByUser) { logger.info(String.format("Not using %s because it was not selected by the user", indexer.getName())); notSelectedIndersWithReason.put(indexer, "Not selected by the user"); return false; } return true; } } | IndexerForSearchSelector { protected boolean checkIndexerSelectedByUser(Indexer indexer) { boolean indexerNotSelectedByUser = (searchRequest.getIndexers().isPresent() && !searchRequest.getIndexers().get().isEmpty()) && !searchRequest.getIndexers().get().contains(indexer.getName()); if (indexerNotSelectedByUser) { logger.info(String.format("Not using %s because it was not selected by the user", indexer.getName())); notSelectedIndersWithReason.put(indexer, "Not selected by the user"); return false; } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkIndexerSelectedByUser(Indexer indexer) { boolean indexerNotSelectedByUser = (searchRequest.getIndexers().isPresent() && !searchRequest.getIndexers().get().isEmpty()) && !searchRequest.getIndexers().get().contains(indexer.getName()); if (indexerNotSelectedByUser) { logger.info(String.format("Not using %s because it was not selected by the user", indexer.getName())); notSelectedIndersWithReason.put(indexer, "Not selected by the user"); return false; } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldAnonymizeUsernameFromUrl() throws Exception { String anonymized = testee.getAnonymizedLog("http: assertThat(anonymized, is("http: } | public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } |
@Test public void shouldAnonymizeUsernameFromConfig() throws Exception { String anonymized = testee.getAnonymizedLog("user=someusername USER:someusername username=someusername username:someusername"); assertThat(anonymized, is("user=<USERNAME> USER:<USERNAME> username=<USERNAME> username:<USERNAME>")); } | public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } |
@Test public void shouldAnonymizeApikeysFromConfig() throws Exception { String anonymized = testee.getAnonymizedLog("r=apikey"); assertThat(anonymized, is("r=<APIKEY>")); } | public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } |
@Test public void shouldAnonymizeCookiesFromConfig() throws Exception { String anonymized = testee.getAnonymizedLog("Cookies: Parsing b[]: remember-me=MTAI4MjHY0MjcXxMTpjM2U0Zjk3OWQwMjk0; Auth-Type=http; Auth-Token=C8wSA1AXvpFVjXCRGKryWtIIZS2TRqf69aZb; HYDRA-XSRF-TOKEN=1a0f551f-2178-4ad7-a0b5-3af8f77675e2"); assertThat(anonymized, is("Cookies: Parsing b[]: remember-me=0:<HIDDEN> Auth-Type=http; Auth-Token=b:<HIDDEN> HYDRA-XSRF-TOKEN=2:<HIDDEN>")); } | public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } | LogAnonymizer { public String getAnonymizedLog(String log) { for (UserAuthConfig userAuthConfig : configProvider.getBaseConfig().getAuth().getUsers()) { logger.debug("Removing username from log"); log = log.replaceAll("(?i)(user|username)([=:])" + userAuthConfig.getUsername(), "$1$2<USERNAME>"); } for (IndexerConfig indexerConfig : configProvider.getBaseConfig().getIndexers()) { if (Strings.isNullOrEmpty(indexerConfig.getApiKey()) || indexerConfig.getApiKey().length() < 5) { continue; } logger.debug("Removing API key for indexer {} from log", indexerConfig.getName()); log = log.replace(indexerConfig.getApiKey(), "<APIKEY>"); } logger.debug("Removing URL username/password from log"); log = log.replaceAll("(https?):\\/\\/((.+?)(:(.+?)|)@)", "$1: logger.debug("Removing cookies from log"); log = log.replaceAll("Set-Cookie: (\\w+)=(\\w)+;?", "Set-Cookie: $1:<HIDDEN>"); log = log.replaceAll("remember-me=(\\w)+;?", "remember-me=$1:<HIDDEN>"); log = log.replaceAll("Auth-Token=(\\w)+;?", "Auth-Token=$1:<HIDDEN>"); log = log.replaceAll("HYDRA-XSRF-TOKEN=([\\w\\-])+;?", "HYDRA-XSRF-TOKEN=$1:<HIDDEN>"); logger.debug("Removing base path from log"); log = log.replace(new File("").getAbsolutePath(), "<BASEPATH>"); log = removeIpsFromLog(log); return log; } String getAnonymizedLog(String log); } |
@Test public void convertToDatabaseColumn() throws Exception { Category category = new Category(); category.setName("name"); assertThat(testee.convertToDatabaseColumn(category), is("name")); } | @Override public String convertToDatabaseColumn(Category category) { if (category == null) { return null; } return category.getName(); } | CategoryConverter implements AttributeConverter<Category, String> { @Override public String convertToDatabaseColumn(Category category) { if (category == null) { return null; } return category.getName(); } } | CategoryConverter implements AttributeConverter<Category, String> { @Override public String convertToDatabaseColumn(Category category) { if (category == null) { return null; } return category.getName(); } } | CategoryConverter implements AttributeConverter<Category, String> { @Override public String convertToDatabaseColumn(Category category) { if (category == null) { return null; } return category.getName(); } @Autowired void setCategoryProvider(CategoryProvider categoryProvider); @Override String convertToDatabaseColumn(Category category); @Override Category convertToEntityAttribute(String categoryName); } | CategoryConverter implements AttributeConverter<Category, String> { @Override public String convertToDatabaseColumn(Category category) { if (category == null) { return null; } return category.getName(); } @Autowired void setCategoryProvider(CategoryProvider categoryProvider); @Override String convertToDatabaseColumn(Category category); @Override Category convertToEntityAttribute(String categoryName); } |
@Test public void convertToEntityAttribute() throws Exception { Category category = new Category(); when(categoryProviderMock.getByInternalName("name")).thenReturn(category); assertThat(testee.convertToEntityAttribute("name"), is(category)); } | @Override public Category convertToEntityAttribute(String categoryName) { return categoryProvider.getByInternalName(categoryName); } | CategoryConverter implements AttributeConverter<Category, String> { @Override public Category convertToEntityAttribute(String categoryName) { return categoryProvider.getByInternalName(categoryName); } } | CategoryConverter implements AttributeConverter<Category, String> { @Override public Category convertToEntityAttribute(String categoryName) { return categoryProvider.getByInternalName(categoryName); } } | CategoryConverter implements AttributeConverter<Category, String> { @Override public Category convertToEntityAttribute(String categoryName) { return categoryProvider.getByInternalName(categoryName); } @Autowired void setCategoryProvider(CategoryProvider categoryProvider); @Override String convertToDatabaseColumn(Category category); @Override Category convertToEntityAttribute(String categoryName); } | CategoryConverter implements AttributeConverter<Category, String> { @Override public Category convertToEntityAttribute(String categoryName) { return categoryProvider.getByInternalName(categoryName); } @Autowired void setCategoryProvider(CategoryProvider categoryProvider); @Override String convertToDatabaseColumn(Category category); @Override Category convertToEntityAttribute(String categoryName); } |
@Test public void shouldUseCorrectApplicationType() { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); SearchResultItem searchResultItem = new SearchResultItem(); searchResultItem.setIndexer(indexerMock); searchResultItem.setCategory(new Category()); searchRequest.setDownloadType(DownloadType.NZB); NewznabXmlItem item = testee.buildRssItem(searchResultItem, searchRequest.getDownloadType() == DownloadType.NZB); assertThat(item.getEnclosure().getType()).isEqualTo("application/x-nzb"); searchRequest.setDownloadType(DownloadType.TORRENT); item = testee.buildRssItem(searchResultItem, searchRequest.getDownloadType() == DownloadType.NZB); assertThat(item.getEnclosure().getType()).isEqualTo("application/x-bittorrent"); } | NewznabXmlItem buildRssItem(SearchResultItem searchResultItem, boolean isNzb) { NewznabXmlItem rssItem = new NewznabXmlItem(); String link = nzbHandler.getDownloadLinkForResults(searchResultItem.getSearchResultId(), false, isNzb ? DownloadType.NZB : DownloadType.TORRENT); rssItem.setLink(link); rssItem.setTitle(searchResultItem.getTitle()); rssItem.setRssGuid(new NewznabXmlGuid(String.valueOf(searchResultItem.getGuid()), false)); rssItem.setSize(searchResultItem.getSize()); if (searchResultItem.getPubDate() != null) { rssItem.setPubDate(searchResultItem.getPubDate()); } else { rssItem.setPubDate(searchResultItem.getBestDate()); } searchResultItem.getAttributes().put("guid", String.valueOf(searchResultItem.getSearchResultId())); List<NewznabAttribute> newznabAttributes = searchResultItem.getAttributes().entrySet().stream().map(attribute -> new NewznabAttribute(attribute.getKey(), attribute.getValue())).sorted(Comparator.comparing(NewznabAttribute::getName)).collect(Collectors.toList()); if (searchResultItem.getIndexer() != null) { newznabAttributes.add(new NewznabAttribute("hydraIndexerScore", String.valueOf(searchResultItem.getIndexer().getConfig().getScore()))); newznabAttributes.add(new NewznabAttribute("hydraIndexerHost", getIndexerHost(searchResultItem))); newznabAttributes.add(new NewznabAttribute("hydraIndexerName", String.valueOf(searchResultItem.getIndexer().getName()))); } String resultType; if (isNzb) { rssItem.setNewznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_NZB; } else { rssItem.setTorznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_TORRENT; } rssItem.setEnclosure(new NewznabXmlEnclosure(link, searchResultItem.getSize(), resultType)); rssItem.setComments(searchResultItem.getCommentsLink()); rssItem.setDescription(searchResultItem.getDescription()); rssItem.setCategory(configProvider.getBaseConfig().getSearching().isUseOriginalCategories() ? searchResultItem.getOriginalCategory() : searchResultItem.getCategory().getName()); return rssItem; } | NewznabXmlTransformer { NewznabXmlItem buildRssItem(SearchResultItem searchResultItem, boolean isNzb) { NewznabXmlItem rssItem = new NewznabXmlItem(); String link = nzbHandler.getDownloadLinkForResults(searchResultItem.getSearchResultId(), false, isNzb ? DownloadType.NZB : DownloadType.TORRENT); rssItem.setLink(link); rssItem.setTitle(searchResultItem.getTitle()); rssItem.setRssGuid(new NewznabXmlGuid(String.valueOf(searchResultItem.getGuid()), false)); rssItem.setSize(searchResultItem.getSize()); if (searchResultItem.getPubDate() != null) { rssItem.setPubDate(searchResultItem.getPubDate()); } else { rssItem.setPubDate(searchResultItem.getBestDate()); } searchResultItem.getAttributes().put("guid", String.valueOf(searchResultItem.getSearchResultId())); List<NewznabAttribute> newznabAttributes = searchResultItem.getAttributes().entrySet().stream().map(attribute -> new NewznabAttribute(attribute.getKey(), attribute.getValue())).sorted(Comparator.comparing(NewznabAttribute::getName)).collect(Collectors.toList()); if (searchResultItem.getIndexer() != null) { newznabAttributes.add(new NewznabAttribute("hydraIndexerScore", String.valueOf(searchResultItem.getIndexer().getConfig().getScore()))); newznabAttributes.add(new NewznabAttribute("hydraIndexerHost", getIndexerHost(searchResultItem))); newznabAttributes.add(new NewznabAttribute("hydraIndexerName", String.valueOf(searchResultItem.getIndexer().getName()))); } String resultType; if (isNzb) { rssItem.setNewznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_NZB; } else { rssItem.setTorznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_TORRENT; } rssItem.setEnclosure(new NewznabXmlEnclosure(link, searchResultItem.getSize(), resultType)); rssItem.setComments(searchResultItem.getCommentsLink()); rssItem.setDescription(searchResultItem.getDescription()); rssItem.setCategory(configProvider.getBaseConfig().getSearching().isUseOriginalCategories() ? searchResultItem.getOriginalCategory() : searchResultItem.getCategory().getName()); return rssItem; } } | NewznabXmlTransformer { NewznabXmlItem buildRssItem(SearchResultItem searchResultItem, boolean isNzb) { NewznabXmlItem rssItem = new NewznabXmlItem(); String link = nzbHandler.getDownloadLinkForResults(searchResultItem.getSearchResultId(), false, isNzb ? DownloadType.NZB : DownloadType.TORRENT); rssItem.setLink(link); rssItem.setTitle(searchResultItem.getTitle()); rssItem.setRssGuid(new NewznabXmlGuid(String.valueOf(searchResultItem.getGuid()), false)); rssItem.setSize(searchResultItem.getSize()); if (searchResultItem.getPubDate() != null) { rssItem.setPubDate(searchResultItem.getPubDate()); } else { rssItem.setPubDate(searchResultItem.getBestDate()); } searchResultItem.getAttributes().put("guid", String.valueOf(searchResultItem.getSearchResultId())); List<NewznabAttribute> newznabAttributes = searchResultItem.getAttributes().entrySet().stream().map(attribute -> new NewznabAttribute(attribute.getKey(), attribute.getValue())).sorted(Comparator.comparing(NewznabAttribute::getName)).collect(Collectors.toList()); if (searchResultItem.getIndexer() != null) { newznabAttributes.add(new NewznabAttribute("hydraIndexerScore", String.valueOf(searchResultItem.getIndexer().getConfig().getScore()))); newznabAttributes.add(new NewznabAttribute("hydraIndexerHost", getIndexerHost(searchResultItem))); newznabAttributes.add(new NewznabAttribute("hydraIndexerName", String.valueOf(searchResultItem.getIndexer().getName()))); } String resultType; if (isNzb) { rssItem.setNewznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_NZB; } else { rssItem.setTorznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_TORRENT; } rssItem.setEnclosure(new NewznabXmlEnclosure(link, searchResultItem.getSize(), resultType)); rssItem.setComments(searchResultItem.getCommentsLink()); rssItem.setDescription(searchResultItem.getDescription()); rssItem.setCategory(configProvider.getBaseConfig().getSearching().isUseOriginalCategories() ? searchResultItem.getOriginalCategory() : searchResultItem.getCategory().getName()); return rssItem; } } | NewznabXmlTransformer { NewznabXmlItem buildRssItem(SearchResultItem searchResultItem, boolean isNzb) { NewznabXmlItem rssItem = new NewznabXmlItem(); String link = nzbHandler.getDownloadLinkForResults(searchResultItem.getSearchResultId(), false, isNzb ? DownloadType.NZB : DownloadType.TORRENT); rssItem.setLink(link); rssItem.setTitle(searchResultItem.getTitle()); rssItem.setRssGuid(new NewznabXmlGuid(String.valueOf(searchResultItem.getGuid()), false)); rssItem.setSize(searchResultItem.getSize()); if (searchResultItem.getPubDate() != null) { rssItem.setPubDate(searchResultItem.getPubDate()); } else { rssItem.setPubDate(searchResultItem.getBestDate()); } searchResultItem.getAttributes().put("guid", String.valueOf(searchResultItem.getSearchResultId())); List<NewznabAttribute> newznabAttributes = searchResultItem.getAttributes().entrySet().stream().map(attribute -> new NewznabAttribute(attribute.getKey(), attribute.getValue())).sorted(Comparator.comparing(NewznabAttribute::getName)).collect(Collectors.toList()); if (searchResultItem.getIndexer() != null) { newznabAttributes.add(new NewznabAttribute("hydraIndexerScore", String.valueOf(searchResultItem.getIndexer().getConfig().getScore()))); newznabAttributes.add(new NewznabAttribute("hydraIndexerHost", getIndexerHost(searchResultItem))); newznabAttributes.add(new NewznabAttribute("hydraIndexerName", String.valueOf(searchResultItem.getIndexer().getName()))); } String resultType; if (isNzb) { rssItem.setNewznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_NZB; } else { rssItem.setTorznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_TORRENT; } rssItem.setEnclosure(new NewznabXmlEnclosure(link, searchResultItem.getSize(), resultType)); rssItem.setComments(searchResultItem.getCommentsLink()); rssItem.setDescription(searchResultItem.getDescription()); rssItem.setCategory(configProvider.getBaseConfig().getSearching().isUseOriginalCategories() ? searchResultItem.getOriginalCategory() : searchResultItem.getCategory().getName()); return rssItem; } } | NewznabXmlTransformer { NewznabXmlItem buildRssItem(SearchResultItem searchResultItem, boolean isNzb) { NewznabXmlItem rssItem = new NewznabXmlItem(); String link = nzbHandler.getDownloadLinkForResults(searchResultItem.getSearchResultId(), false, isNzb ? DownloadType.NZB : DownloadType.TORRENT); rssItem.setLink(link); rssItem.setTitle(searchResultItem.getTitle()); rssItem.setRssGuid(new NewznabXmlGuid(String.valueOf(searchResultItem.getGuid()), false)); rssItem.setSize(searchResultItem.getSize()); if (searchResultItem.getPubDate() != null) { rssItem.setPubDate(searchResultItem.getPubDate()); } else { rssItem.setPubDate(searchResultItem.getBestDate()); } searchResultItem.getAttributes().put("guid", String.valueOf(searchResultItem.getSearchResultId())); List<NewznabAttribute> newznabAttributes = searchResultItem.getAttributes().entrySet().stream().map(attribute -> new NewznabAttribute(attribute.getKey(), attribute.getValue())).sorted(Comparator.comparing(NewznabAttribute::getName)).collect(Collectors.toList()); if (searchResultItem.getIndexer() != null) { newznabAttributes.add(new NewznabAttribute("hydraIndexerScore", String.valueOf(searchResultItem.getIndexer().getConfig().getScore()))); newznabAttributes.add(new NewznabAttribute("hydraIndexerHost", getIndexerHost(searchResultItem))); newznabAttributes.add(new NewznabAttribute("hydraIndexerName", String.valueOf(searchResultItem.getIndexer().getName()))); } String resultType; if (isNzb) { rssItem.setNewznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_NZB; } else { rssItem.setTorznabAttributes(newznabAttributes); resultType = APPLICATION_TYPE_TORRENT; } rssItem.setEnclosure(new NewznabXmlEnclosure(link, searchResultItem.getSize(), resultType)); rssItem.setComments(searchResultItem.getCommentsLink()); rssItem.setDescription(searchResultItem.getDescription()); rssItem.setCategory(configProvider.getBaseConfig().getSearching().isUseOriginalCategories() ? searchResultItem.getOriginalCategory() : searchResultItem.getCategory().getName()); return rssItem; } } |
@Test public void shouldGenerateCategoriesFromConfig() throws Exception { CapsXmlCategories xmlCategories = testee.getCapsXmlCategories(); assertThat(xmlCategories.getCategories().size()).isEqualTo(3); assertThat(xmlCategories.getCategories().get(0).getName()).isEqualTo("Misc"); assertThat(xmlCategories.getCategories().get(1).getName()).isEqualTo("Movies"); assertThat(xmlCategories.getCategories().get(1).getSubCategories().size()).isEqualTo(1); assertThat(xmlCategories.getCategories().get(1).getSubCategories().get(0).getName()).isEqualTo("Movies HD"); assertThat(xmlCategories.getCategories().get(2).getName()).isEqualTo("Musc"); } | CapsXmlCategories getCapsXmlCategories() { if (configProvider.getBaseConfig().getSearching().isTransformNewznabCategories()) { Map<Integer, CapsXmlCategory> mainXmlCategoriesMap = new HashMap<>(); Set<String> alreadyAdded = new HashSet<>(); for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { category.getNewznabCategories().stream().flatMap(Collection::stream).sorted(Comparator.naturalOrder()).filter(x -> x % 1000 == 0).forEach(x -> { CapsXmlCategory xmlCategory = new CapsXmlCategory(x, category.getName(), new ArrayList<>()); mainXmlCategoriesMap.put(x, xmlCategory); alreadyAdded.add(category.getName()); }); } for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { List<Integer> subCategories = category.getNewznabCategories().stream().flatMap(Collection::stream).filter(x -> x % 1000 != 0) .sorted(Comparator.naturalOrder()) .collect(Collectors.toList()); for (Integer subCategory : subCategories) { if (alreadyAdded.contains(category.getName())) { continue; } int itsMainCategoryNumber = subCategory / 1000 * 1000; if (mainXmlCategoriesMap.containsKey(itsMainCategoryNumber)) { boolean alreadyPresent = mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().stream().anyMatch(x -> x.getName().equals(category.getName())); if (!alreadyPresent) { mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().add(new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } } else { mainXmlCategoriesMap.put(subCategory, new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } alreadyAdded.add(category.getName()); } } ArrayList<CapsXmlCategory> categories = new ArrayList<>(mainXmlCategoriesMap.values()); categories.sort(Comparator.comparing(CapsXmlCategory::getId)); return new CapsXmlCategories(categories); } else { List<CapsXmlCategory> mainCategories = new ArrayList<>(); mainCategories.add(new CapsXmlCategory(1000, "Console", Arrays.asList( new CapsXmlCategory(1010, "NDS"), new CapsXmlCategory(1020, "PSP"), new CapsXmlCategory(1030, "Wii"), new CapsXmlCategory(1040, "XBox"), new CapsXmlCategory(1050, "Xbox 360"), new CapsXmlCategory(1060, "Wiiware"), new CapsXmlCategory(1070, "Xbox 360 DLC") ))); mainCategories.add(new CapsXmlCategory(2000, "Movies", Arrays.asList( new CapsXmlCategory(2010, "Foreign"), new CapsXmlCategory(2020, "Other"), new CapsXmlCategory(2030, "SD"), new CapsXmlCategory(2040, "HD"), new CapsXmlCategory(2045, "UHD"), new CapsXmlCategory(2050, "Bluray"), new CapsXmlCategory(2060, "3D") ))); mainCategories.add(new CapsXmlCategory(3000, "Audio", Arrays.asList( new CapsXmlCategory(3010, "MP3"), new CapsXmlCategory(3020, "Video"), new CapsXmlCategory(3030, "Audiobook"), new CapsXmlCategory(3040, "Lossless") ))); mainCategories.add(new CapsXmlCategory(4000, "PC", Arrays.asList( new CapsXmlCategory(4010, "0day"), new CapsXmlCategory(4020, "ISO"), new CapsXmlCategory(4030, "Mac"), new CapsXmlCategory(4040, "Mobile Oher"), new CapsXmlCategory(4050, "Games"), new CapsXmlCategory(4060, "Mobile IOS"), new CapsXmlCategory(4070, "Mobile Android") ))); mainCategories.add(new CapsXmlCategory(5000, "TV", Arrays.asList( new CapsXmlCategory(5020, "Foreign"), new CapsXmlCategory(5030, "SD"), new CapsXmlCategory(5040, "HD"), new CapsXmlCategory(5045, "UHD"), new CapsXmlCategory(5050, "Other"), new CapsXmlCategory(5060, "Sport"), new CapsXmlCategory(5070, "Anime"), new CapsXmlCategory(5080, "Documentary") ))); mainCategories.add(new CapsXmlCategory(6000, "XXX", Arrays.asList( new CapsXmlCategory(6010, "DVD"), new CapsXmlCategory(6020, "WMV"), new CapsXmlCategory(6030, "XviD"), new CapsXmlCategory(6040, "x264"), new CapsXmlCategory(6050, "Pack"), new CapsXmlCategory(6060, "Imgset"), new CapsXmlCategory(6070, "Other") ))); mainCategories.add(new CapsXmlCategory(7000, "Books", Arrays.asList( new CapsXmlCategory(7010, "Mags"), new CapsXmlCategory(7020, "Ebook"), new CapsXmlCategory(7030, "COmics") ))); mainCategories.add(new CapsXmlCategory(8000, "Other", Arrays.asList( new CapsXmlCategory(8010, "Misc") ))); return new CapsXmlCategories(mainCategories); } } | CapsGenerator { CapsXmlCategories getCapsXmlCategories() { if (configProvider.getBaseConfig().getSearching().isTransformNewznabCategories()) { Map<Integer, CapsXmlCategory> mainXmlCategoriesMap = new HashMap<>(); Set<String> alreadyAdded = new HashSet<>(); for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { category.getNewznabCategories().stream().flatMap(Collection::stream).sorted(Comparator.naturalOrder()).filter(x -> x % 1000 == 0).forEach(x -> { CapsXmlCategory xmlCategory = new CapsXmlCategory(x, category.getName(), new ArrayList<>()); mainXmlCategoriesMap.put(x, xmlCategory); alreadyAdded.add(category.getName()); }); } for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { List<Integer> subCategories = category.getNewznabCategories().stream().flatMap(Collection::stream).filter(x -> x % 1000 != 0) .sorted(Comparator.naturalOrder()) .collect(Collectors.toList()); for (Integer subCategory : subCategories) { if (alreadyAdded.contains(category.getName())) { continue; } int itsMainCategoryNumber = subCategory / 1000 * 1000; if (mainXmlCategoriesMap.containsKey(itsMainCategoryNumber)) { boolean alreadyPresent = mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().stream().anyMatch(x -> x.getName().equals(category.getName())); if (!alreadyPresent) { mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().add(new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } } else { mainXmlCategoriesMap.put(subCategory, new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } alreadyAdded.add(category.getName()); } } ArrayList<CapsXmlCategory> categories = new ArrayList<>(mainXmlCategoriesMap.values()); categories.sort(Comparator.comparing(CapsXmlCategory::getId)); return new CapsXmlCategories(categories); } else { List<CapsXmlCategory> mainCategories = new ArrayList<>(); mainCategories.add(new CapsXmlCategory(1000, "Console", Arrays.asList( new CapsXmlCategory(1010, "NDS"), new CapsXmlCategory(1020, "PSP"), new CapsXmlCategory(1030, "Wii"), new CapsXmlCategory(1040, "XBox"), new CapsXmlCategory(1050, "Xbox 360"), new CapsXmlCategory(1060, "Wiiware"), new CapsXmlCategory(1070, "Xbox 360 DLC") ))); mainCategories.add(new CapsXmlCategory(2000, "Movies", Arrays.asList( new CapsXmlCategory(2010, "Foreign"), new CapsXmlCategory(2020, "Other"), new CapsXmlCategory(2030, "SD"), new CapsXmlCategory(2040, "HD"), new CapsXmlCategory(2045, "UHD"), new CapsXmlCategory(2050, "Bluray"), new CapsXmlCategory(2060, "3D") ))); mainCategories.add(new CapsXmlCategory(3000, "Audio", Arrays.asList( new CapsXmlCategory(3010, "MP3"), new CapsXmlCategory(3020, "Video"), new CapsXmlCategory(3030, "Audiobook"), new CapsXmlCategory(3040, "Lossless") ))); mainCategories.add(new CapsXmlCategory(4000, "PC", Arrays.asList( new CapsXmlCategory(4010, "0day"), new CapsXmlCategory(4020, "ISO"), new CapsXmlCategory(4030, "Mac"), new CapsXmlCategory(4040, "Mobile Oher"), new CapsXmlCategory(4050, "Games"), new CapsXmlCategory(4060, "Mobile IOS"), new CapsXmlCategory(4070, "Mobile Android") ))); mainCategories.add(new CapsXmlCategory(5000, "TV", Arrays.asList( new CapsXmlCategory(5020, "Foreign"), new CapsXmlCategory(5030, "SD"), new CapsXmlCategory(5040, "HD"), new CapsXmlCategory(5045, "UHD"), new CapsXmlCategory(5050, "Other"), new CapsXmlCategory(5060, "Sport"), new CapsXmlCategory(5070, "Anime"), new CapsXmlCategory(5080, "Documentary") ))); mainCategories.add(new CapsXmlCategory(6000, "XXX", Arrays.asList( new CapsXmlCategory(6010, "DVD"), new CapsXmlCategory(6020, "WMV"), new CapsXmlCategory(6030, "XviD"), new CapsXmlCategory(6040, "x264"), new CapsXmlCategory(6050, "Pack"), new CapsXmlCategory(6060, "Imgset"), new CapsXmlCategory(6070, "Other") ))); mainCategories.add(new CapsXmlCategory(7000, "Books", Arrays.asList( new CapsXmlCategory(7010, "Mags"), new CapsXmlCategory(7020, "Ebook"), new CapsXmlCategory(7030, "COmics") ))); mainCategories.add(new CapsXmlCategory(8000, "Other", Arrays.asList( new CapsXmlCategory(8010, "Misc") ))); return new CapsXmlCategories(mainCategories); } } } | CapsGenerator { CapsXmlCategories getCapsXmlCategories() { if (configProvider.getBaseConfig().getSearching().isTransformNewznabCategories()) { Map<Integer, CapsXmlCategory> mainXmlCategoriesMap = new HashMap<>(); Set<String> alreadyAdded = new HashSet<>(); for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { category.getNewznabCategories().stream().flatMap(Collection::stream).sorted(Comparator.naturalOrder()).filter(x -> x % 1000 == 0).forEach(x -> { CapsXmlCategory xmlCategory = new CapsXmlCategory(x, category.getName(), new ArrayList<>()); mainXmlCategoriesMap.put(x, xmlCategory); alreadyAdded.add(category.getName()); }); } for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { List<Integer> subCategories = category.getNewznabCategories().stream().flatMap(Collection::stream).filter(x -> x % 1000 != 0) .sorted(Comparator.naturalOrder()) .collect(Collectors.toList()); for (Integer subCategory : subCategories) { if (alreadyAdded.contains(category.getName())) { continue; } int itsMainCategoryNumber = subCategory / 1000 * 1000; if (mainXmlCategoriesMap.containsKey(itsMainCategoryNumber)) { boolean alreadyPresent = mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().stream().anyMatch(x -> x.getName().equals(category.getName())); if (!alreadyPresent) { mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().add(new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } } else { mainXmlCategoriesMap.put(subCategory, new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } alreadyAdded.add(category.getName()); } } ArrayList<CapsXmlCategory> categories = new ArrayList<>(mainXmlCategoriesMap.values()); categories.sort(Comparator.comparing(CapsXmlCategory::getId)); return new CapsXmlCategories(categories); } else { List<CapsXmlCategory> mainCategories = new ArrayList<>(); mainCategories.add(new CapsXmlCategory(1000, "Console", Arrays.asList( new CapsXmlCategory(1010, "NDS"), new CapsXmlCategory(1020, "PSP"), new CapsXmlCategory(1030, "Wii"), new CapsXmlCategory(1040, "XBox"), new CapsXmlCategory(1050, "Xbox 360"), new CapsXmlCategory(1060, "Wiiware"), new CapsXmlCategory(1070, "Xbox 360 DLC") ))); mainCategories.add(new CapsXmlCategory(2000, "Movies", Arrays.asList( new CapsXmlCategory(2010, "Foreign"), new CapsXmlCategory(2020, "Other"), new CapsXmlCategory(2030, "SD"), new CapsXmlCategory(2040, "HD"), new CapsXmlCategory(2045, "UHD"), new CapsXmlCategory(2050, "Bluray"), new CapsXmlCategory(2060, "3D") ))); mainCategories.add(new CapsXmlCategory(3000, "Audio", Arrays.asList( new CapsXmlCategory(3010, "MP3"), new CapsXmlCategory(3020, "Video"), new CapsXmlCategory(3030, "Audiobook"), new CapsXmlCategory(3040, "Lossless") ))); mainCategories.add(new CapsXmlCategory(4000, "PC", Arrays.asList( new CapsXmlCategory(4010, "0day"), new CapsXmlCategory(4020, "ISO"), new CapsXmlCategory(4030, "Mac"), new CapsXmlCategory(4040, "Mobile Oher"), new CapsXmlCategory(4050, "Games"), new CapsXmlCategory(4060, "Mobile IOS"), new CapsXmlCategory(4070, "Mobile Android") ))); mainCategories.add(new CapsXmlCategory(5000, "TV", Arrays.asList( new CapsXmlCategory(5020, "Foreign"), new CapsXmlCategory(5030, "SD"), new CapsXmlCategory(5040, "HD"), new CapsXmlCategory(5045, "UHD"), new CapsXmlCategory(5050, "Other"), new CapsXmlCategory(5060, "Sport"), new CapsXmlCategory(5070, "Anime"), new CapsXmlCategory(5080, "Documentary") ))); mainCategories.add(new CapsXmlCategory(6000, "XXX", Arrays.asList( new CapsXmlCategory(6010, "DVD"), new CapsXmlCategory(6020, "WMV"), new CapsXmlCategory(6030, "XviD"), new CapsXmlCategory(6040, "x264"), new CapsXmlCategory(6050, "Pack"), new CapsXmlCategory(6060, "Imgset"), new CapsXmlCategory(6070, "Other") ))); mainCategories.add(new CapsXmlCategory(7000, "Books", Arrays.asList( new CapsXmlCategory(7010, "Mags"), new CapsXmlCategory(7020, "Ebook"), new CapsXmlCategory(7030, "COmics") ))); mainCategories.add(new CapsXmlCategory(8000, "Other", Arrays.asList( new CapsXmlCategory(8010, "Misc") ))); return new CapsXmlCategories(mainCategories); } } } | CapsGenerator { CapsXmlCategories getCapsXmlCategories() { if (configProvider.getBaseConfig().getSearching().isTransformNewznabCategories()) { Map<Integer, CapsXmlCategory> mainXmlCategoriesMap = new HashMap<>(); Set<String> alreadyAdded = new HashSet<>(); for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { category.getNewznabCategories().stream().flatMap(Collection::stream).sorted(Comparator.naturalOrder()).filter(x -> x % 1000 == 0).forEach(x -> { CapsXmlCategory xmlCategory = new CapsXmlCategory(x, category.getName(), new ArrayList<>()); mainXmlCategoriesMap.put(x, xmlCategory); alreadyAdded.add(category.getName()); }); } for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { List<Integer> subCategories = category.getNewznabCategories().stream().flatMap(Collection::stream).filter(x -> x % 1000 != 0) .sorted(Comparator.naturalOrder()) .collect(Collectors.toList()); for (Integer subCategory : subCategories) { if (alreadyAdded.contains(category.getName())) { continue; } int itsMainCategoryNumber = subCategory / 1000 * 1000; if (mainXmlCategoriesMap.containsKey(itsMainCategoryNumber)) { boolean alreadyPresent = mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().stream().anyMatch(x -> x.getName().equals(category.getName())); if (!alreadyPresent) { mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().add(new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } } else { mainXmlCategoriesMap.put(subCategory, new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } alreadyAdded.add(category.getName()); } } ArrayList<CapsXmlCategory> categories = new ArrayList<>(mainXmlCategoriesMap.values()); categories.sort(Comparator.comparing(CapsXmlCategory::getId)); return new CapsXmlCategories(categories); } else { List<CapsXmlCategory> mainCategories = new ArrayList<>(); mainCategories.add(new CapsXmlCategory(1000, "Console", Arrays.asList( new CapsXmlCategory(1010, "NDS"), new CapsXmlCategory(1020, "PSP"), new CapsXmlCategory(1030, "Wii"), new CapsXmlCategory(1040, "XBox"), new CapsXmlCategory(1050, "Xbox 360"), new CapsXmlCategory(1060, "Wiiware"), new CapsXmlCategory(1070, "Xbox 360 DLC") ))); mainCategories.add(new CapsXmlCategory(2000, "Movies", Arrays.asList( new CapsXmlCategory(2010, "Foreign"), new CapsXmlCategory(2020, "Other"), new CapsXmlCategory(2030, "SD"), new CapsXmlCategory(2040, "HD"), new CapsXmlCategory(2045, "UHD"), new CapsXmlCategory(2050, "Bluray"), new CapsXmlCategory(2060, "3D") ))); mainCategories.add(new CapsXmlCategory(3000, "Audio", Arrays.asList( new CapsXmlCategory(3010, "MP3"), new CapsXmlCategory(3020, "Video"), new CapsXmlCategory(3030, "Audiobook"), new CapsXmlCategory(3040, "Lossless") ))); mainCategories.add(new CapsXmlCategory(4000, "PC", Arrays.asList( new CapsXmlCategory(4010, "0day"), new CapsXmlCategory(4020, "ISO"), new CapsXmlCategory(4030, "Mac"), new CapsXmlCategory(4040, "Mobile Oher"), new CapsXmlCategory(4050, "Games"), new CapsXmlCategory(4060, "Mobile IOS"), new CapsXmlCategory(4070, "Mobile Android") ))); mainCategories.add(new CapsXmlCategory(5000, "TV", Arrays.asList( new CapsXmlCategory(5020, "Foreign"), new CapsXmlCategory(5030, "SD"), new CapsXmlCategory(5040, "HD"), new CapsXmlCategory(5045, "UHD"), new CapsXmlCategory(5050, "Other"), new CapsXmlCategory(5060, "Sport"), new CapsXmlCategory(5070, "Anime"), new CapsXmlCategory(5080, "Documentary") ))); mainCategories.add(new CapsXmlCategory(6000, "XXX", Arrays.asList( new CapsXmlCategory(6010, "DVD"), new CapsXmlCategory(6020, "WMV"), new CapsXmlCategory(6030, "XviD"), new CapsXmlCategory(6040, "x264"), new CapsXmlCategory(6050, "Pack"), new CapsXmlCategory(6060, "Imgset"), new CapsXmlCategory(6070, "Other") ))); mainCategories.add(new CapsXmlCategory(7000, "Books", Arrays.asList( new CapsXmlCategory(7010, "Mags"), new CapsXmlCategory(7020, "Ebook"), new CapsXmlCategory(7030, "COmics") ))); mainCategories.add(new CapsXmlCategory(8000, "Other", Arrays.asList( new CapsXmlCategory(8010, "Misc") ))); return new CapsXmlCategories(mainCategories); } } } | CapsGenerator { CapsXmlCategories getCapsXmlCategories() { if (configProvider.getBaseConfig().getSearching().isTransformNewznabCategories()) { Map<Integer, CapsXmlCategory> mainXmlCategoriesMap = new HashMap<>(); Set<String> alreadyAdded = new HashSet<>(); for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { category.getNewznabCategories().stream().flatMap(Collection::stream).sorted(Comparator.naturalOrder()).filter(x -> x % 1000 == 0).forEach(x -> { CapsXmlCategory xmlCategory = new CapsXmlCategory(x, category.getName(), new ArrayList<>()); mainXmlCategoriesMap.put(x, xmlCategory); alreadyAdded.add(category.getName()); }); } for (Category category : configProvider.getBaseConfig().getCategoriesConfig().getCategories()) { List<Integer> subCategories = category.getNewznabCategories().stream().flatMap(Collection::stream).filter(x -> x % 1000 != 0) .sorted(Comparator.naturalOrder()) .collect(Collectors.toList()); for (Integer subCategory : subCategories) { if (alreadyAdded.contains(category.getName())) { continue; } int itsMainCategoryNumber = subCategory / 1000 * 1000; if (mainXmlCategoriesMap.containsKey(itsMainCategoryNumber)) { boolean alreadyPresent = mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().stream().anyMatch(x -> x.getName().equals(category.getName())); if (!alreadyPresent) { mainXmlCategoriesMap.get(itsMainCategoryNumber).getSubCategories().add(new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } } else { mainXmlCategoriesMap.put(subCategory, new CapsXmlCategory(subCategory, category.getName(), new ArrayList<>())); } alreadyAdded.add(category.getName()); } } ArrayList<CapsXmlCategory> categories = new ArrayList<>(mainXmlCategoriesMap.values()); categories.sort(Comparator.comparing(CapsXmlCategory::getId)); return new CapsXmlCategories(categories); } else { List<CapsXmlCategory> mainCategories = new ArrayList<>(); mainCategories.add(new CapsXmlCategory(1000, "Console", Arrays.asList( new CapsXmlCategory(1010, "NDS"), new CapsXmlCategory(1020, "PSP"), new CapsXmlCategory(1030, "Wii"), new CapsXmlCategory(1040, "XBox"), new CapsXmlCategory(1050, "Xbox 360"), new CapsXmlCategory(1060, "Wiiware"), new CapsXmlCategory(1070, "Xbox 360 DLC") ))); mainCategories.add(new CapsXmlCategory(2000, "Movies", Arrays.asList( new CapsXmlCategory(2010, "Foreign"), new CapsXmlCategory(2020, "Other"), new CapsXmlCategory(2030, "SD"), new CapsXmlCategory(2040, "HD"), new CapsXmlCategory(2045, "UHD"), new CapsXmlCategory(2050, "Bluray"), new CapsXmlCategory(2060, "3D") ))); mainCategories.add(new CapsXmlCategory(3000, "Audio", Arrays.asList( new CapsXmlCategory(3010, "MP3"), new CapsXmlCategory(3020, "Video"), new CapsXmlCategory(3030, "Audiobook"), new CapsXmlCategory(3040, "Lossless") ))); mainCategories.add(new CapsXmlCategory(4000, "PC", Arrays.asList( new CapsXmlCategory(4010, "0day"), new CapsXmlCategory(4020, "ISO"), new CapsXmlCategory(4030, "Mac"), new CapsXmlCategory(4040, "Mobile Oher"), new CapsXmlCategory(4050, "Games"), new CapsXmlCategory(4060, "Mobile IOS"), new CapsXmlCategory(4070, "Mobile Android") ))); mainCategories.add(new CapsXmlCategory(5000, "TV", Arrays.asList( new CapsXmlCategory(5020, "Foreign"), new CapsXmlCategory(5030, "SD"), new CapsXmlCategory(5040, "HD"), new CapsXmlCategory(5045, "UHD"), new CapsXmlCategory(5050, "Other"), new CapsXmlCategory(5060, "Sport"), new CapsXmlCategory(5070, "Anime"), new CapsXmlCategory(5080, "Documentary") ))); mainCategories.add(new CapsXmlCategory(6000, "XXX", Arrays.asList( new CapsXmlCategory(6010, "DVD"), new CapsXmlCategory(6020, "WMV"), new CapsXmlCategory(6030, "XviD"), new CapsXmlCategory(6040, "x264"), new CapsXmlCategory(6050, "Pack"), new CapsXmlCategory(6060, "Imgset"), new CapsXmlCategory(6070, "Other") ))); mainCategories.add(new CapsXmlCategory(7000, "Books", Arrays.asList( new CapsXmlCategory(7010, "Mags"), new CapsXmlCategory(7020, "Ebook"), new CapsXmlCategory(7030, "COmics") ))); mainCategories.add(new CapsXmlCategory(8000, "Other", Arrays.asList( new CapsXmlCategory(8010, "Misc") ))); return new CapsXmlCategories(mainCategories); } } } |
@Test public void shouldUseCorrectHeaders() throws Exception { NewznabJsonRoot jsonRoot = new NewznabJsonRoot(); when(newznabJsonTransformerMock.transformToRoot(any(), any(), anyInt(), any())).thenReturn(jsonRoot); NewznabParameters parameters = new NewznabParameters(); parameters.setQ("q1"); parameters.setApikey("apikey"); parameters.setT(ActionAttribute.SEARCH); parameters.setO(OutputType.JSON); ResponseEntity<?> responseEntity = testee.api(parameters, null, null); assertThat(responseEntity.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON_UTF8); NewznabXmlRoot xmlRoot = new NewznabXmlRoot(); when(newznabXmlTransformerMock.getRssRoot(any(), any(), anyInt(), any())).thenReturn(xmlRoot); parameters.setO(OutputType.XML); responseEntity = testee.api(parameters, null, null); assertThat(responseEntity.getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_XML); } | @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) public ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock) throws Exception { int searchRequestId = random.nextInt(100000); if (params.getT() != null && params.getT().isSearch()) { MDC.put("SEARCH", String.valueOf(searchRequestId)); } NewznabResponse.SearchType searchType = getSearchType(); logger.info("Received external {} API call: {}", searchType.name().toLowerCase(), params); if (!noApiKeyNeeded && !Objects.equals(params.getApikey(), configProvider.getBaseConfig().getMain().getApiKey())) { logger.error("Received API call with wrong API key"); throw new WrongApiKeyException("Wrong api key"); } if (!params.getIndexers().isEmpty() && indexerName != null) { logger.error("Received call with parameters set in path and request variables"); NewznabXmlError error = new NewznabXmlError("200", "Received call with parameters set in path and request variables"); return new ResponseEntity<Object>(error, HttpStatus.OK); } else if (indexerName != null) { params.setIndexers(Sets.newHashSet(indexerName)); } if (params.getT() == ActionAttribute.CAPS) { return capsGenerator.getCaps(params.getO(), searchType); } if (Stream.of(ActionAttribute.SEARCH, ActionAttribute.BOOK, ActionAttribute.TVSEARCH, ActionAttribute.MOVIE).anyMatch(x -> x == params.getT())) { if (inMockingMode) { logger.debug("Will mock results for this request"); return new ResponseEntity<>(mockSearch.mockSearch(params, getSearchType() == NewznabResponse.SearchType.NEWZNAB), HttpStatus.OK); } if (params.getCachetime() != null || configProvider.getBaseConfig().getSearching().getGlobalCacheTimeMinutes().isPresent()) { return handleCachingSearch(params, searchType, searchRequestId); } NewznabResponse searchResult = search(params, searchRequestId); HttpHeaders httpHeaders = setSearchTypeAndGetHeaders(params, searchResult); return new ResponseEntity<>(searchResult, httpHeaders, HttpStatus.OK); } if (params.getT() == ActionAttribute.GET) { return getNzb(params); } logger.error("Incorrect API request: {}", params); NewznabXmlError error = new NewznabXmlError("200", "Unknown or incorrect parameter"); return new ResponseEntity<Object>(error, HttpStatus.OK); } | ExternalApi { @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) public ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock) throws Exception { int searchRequestId = random.nextInt(100000); if (params.getT() != null && params.getT().isSearch()) { MDC.put("SEARCH", String.valueOf(searchRequestId)); } NewznabResponse.SearchType searchType = getSearchType(); logger.info("Received external {} API call: {}", searchType.name().toLowerCase(), params); if (!noApiKeyNeeded && !Objects.equals(params.getApikey(), configProvider.getBaseConfig().getMain().getApiKey())) { logger.error("Received API call with wrong API key"); throw new WrongApiKeyException("Wrong api key"); } if (!params.getIndexers().isEmpty() && indexerName != null) { logger.error("Received call with parameters set in path and request variables"); NewznabXmlError error = new NewznabXmlError("200", "Received call with parameters set in path and request variables"); return new ResponseEntity<Object>(error, HttpStatus.OK); } else if (indexerName != null) { params.setIndexers(Sets.newHashSet(indexerName)); } if (params.getT() == ActionAttribute.CAPS) { return capsGenerator.getCaps(params.getO(), searchType); } if (Stream.of(ActionAttribute.SEARCH, ActionAttribute.BOOK, ActionAttribute.TVSEARCH, ActionAttribute.MOVIE).anyMatch(x -> x == params.getT())) { if (inMockingMode) { logger.debug("Will mock results for this request"); return new ResponseEntity<>(mockSearch.mockSearch(params, getSearchType() == NewznabResponse.SearchType.NEWZNAB), HttpStatus.OK); } if (params.getCachetime() != null || configProvider.getBaseConfig().getSearching().getGlobalCacheTimeMinutes().isPresent()) { return handleCachingSearch(params, searchType, searchRequestId); } NewznabResponse searchResult = search(params, searchRequestId); HttpHeaders httpHeaders = setSearchTypeAndGetHeaders(params, searchResult); return new ResponseEntity<>(searchResult, httpHeaders, HttpStatus.OK); } if (params.getT() == ActionAttribute.GET) { return getNzb(params); } logger.error("Incorrect API request: {}", params); NewznabXmlError error = new NewznabXmlError("200", "Unknown or incorrect parameter"); return new ResponseEntity<Object>(error, HttpStatus.OK); } } | ExternalApi { @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) public ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock) throws Exception { int searchRequestId = random.nextInt(100000); if (params.getT() != null && params.getT().isSearch()) { MDC.put("SEARCH", String.valueOf(searchRequestId)); } NewznabResponse.SearchType searchType = getSearchType(); logger.info("Received external {} API call: {}", searchType.name().toLowerCase(), params); if (!noApiKeyNeeded && !Objects.equals(params.getApikey(), configProvider.getBaseConfig().getMain().getApiKey())) { logger.error("Received API call with wrong API key"); throw new WrongApiKeyException("Wrong api key"); } if (!params.getIndexers().isEmpty() && indexerName != null) { logger.error("Received call with parameters set in path and request variables"); NewznabXmlError error = new NewznabXmlError("200", "Received call with parameters set in path and request variables"); return new ResponseEntity<Object>(error, HttpStatus.OK); } else if (indexerName != null) { params.setIndexers(Sets.newHashSet(indexerName)); } if (params.getT() == ActionAttribute.CAPS) { return capsGenerator.getCaps(params.getO(), searchType); } if (Stream.of(ActionAttribute.SEARCH, ActionAttribute.BOOK, ActionAttribute.TVSEARCH, ActionAttribute.MOVIE).anyMatch(x -> x == params.getT())) { if (inMockingMode) { logger.debug("Will mock results for this request"); return new ResponseEntity<>(mockSearch.mockSearch(params, getSearchType() == NewznabResponse.SearchType.NEWZNAB), HttpStatus.OK); } if (params.getCachetime() != null || configProvider.getBaseConfig().getSearching().getGlobalCacheTimeMinutes().isPresent()) { return handleCachingSearch(params, searchType, searchRequestId); } NewznabResponse searchResult = search(params, searchRequestId); HttpHeaders httpHeaders = setSearchTypeAndGetHeaders(params, searchResult); return new ResponseEntity<>(searchResult, httpHeaders, HttpStatus.OK); } if (params.getT() == ActionAttribute.GET) { return getNzb(params); } logger.error("Incorrect API request: {}", params); NewznabXmlError error = new NewznabXmlError("200", "Unknown or incorrect parameter"); return new ResponseEntity<Object>(error, HttpStatus.OK); } } | ExternalApi { @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) public ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock) throws Exception { int searchRequestId = random.nextInt(100000); if (params.getT() != null && params.getT().isSearch()) { MDC.put("SEARCH", String.valueOf(searchRequestId)); } NewznabResponse.SearchType searchType = getSearchType(); logger.info("Received external {} API call: {}", searchType.name().toLowerCase(), params); if (!noApiKeyNeeded && !Objects.equals(params.getApikey(), configProvider.getBaseConfig().getMain().getApiKey())) { logger.error("Received API call with wrong API key"); throw new WrongApiKeyException("Wrong api key"); } if (!params.getIndexers().isEmpty() && indexerName != null) { logger.error("Received call with parameters set in path and request variables"); NewznabXmlError error = new NewznabXmlError("200", "Received call with parameters set in path and request variables"); return new ResponseEntity<Object>(error, HttpStatus.OK); } else if (indexerName != null) { params.setIndexers(Sets.newHashSet(indexerName)); } if (params.getT() == ActionAttribute.CAPS) { return capsGenerator.getCaps(params.getO(), searchType); } if (Stream.of(ActionAttribute.SEARCH, ActionAttribute.BOOK, ActionAttribute.TVSEARCH, ActionAttribute.MOVIE).anyMatch(x -> x == params.getT())) { if (inMockingMode) { logger.debug("Will mock results for this request"); return new ResponseEntity<>(mockSearch.mockSearch(params, getSearchType() == NewznabResponse.SearchType.NEWZNAB), HttpStatus.OK); } if (params.getCachetime() != null || configProvider.getBaseConfig().getSearching().getGlobalCacheTimeMinutes().isPresent()) { return handleCachingSearch(params, searchType, searchRequestId); } NewznabResponse searchResult = search(params, searchRequestId); HttpHeaders httpHeaders = setSearchTypeAndGetHeaders(params, searchResult); return new ResponseEntity<>(searchResult, httpHeaders, HttpStatus.OK); } if (params.getT() == ActionAttribute.GET) { return getNzb(params); } logger.error("Incorrect API request: {}", params); NewznabXmlError error = new NewznabXmlError("200", "Unknown or incorrect parameter"); return new ResponseEntity<Object>(error, HttpStatus.OK); } @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock); static void setInMockingMode(boolean newValue); @ExceptionHandler(value = ExternalApiException.class) NewznabXmlError handler(ExternalApiException e); @ExceptionHandler(value = Exception.class) ResponseEntity handleUnexpectedError(Exception e); } | ExternalApi { @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) public ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock) throws Exception { int searchRequestId = random.nextInt(100000); if (params.getT() != null && params.getT().isSearch()) { MDC.put("SEARCH", String.valueOf(searchRequestId)); } NewznabResponse.SearchType searchType = getSearchType(); logger.info("Received external {} API call: {}", searchType.name().toLowerCase(), params); if (!noApiKeyNeeded && !Objects.equals(params.getApikey(), configProvider.getBaseConfig().getMain().getApiKey())) { logger.error("Received API call with wrong API key"); throw new WrongApiKeyException("Wrong api key"); } if (!params.getIndexers().isEmpty() && indexerName != null) { logger.error("Received call with parameters set in path and request variables"); NewznabXmlError error = new NewznabXmlError("200", "Received call with parameters set in path and request variables"); return new ResponseEntity<Object>(error, HttpStatus.OK); } else if (indexerName != null) { params.setIndexers(Sets.newHashSet(indexerName)); } if (params.getT() == ActionAttribute.CAPS) { return capsGenerator.getCaps(params.getO(), searchType); } if (Stream.of(ActionAttribute.SEARCH, ActionAttribute.BOOK, ActionAttribute.TVSEARCH, ActionAttribute.MOVIE).anyMatch(x -> x == params.getT())) { if (inMockingMode) { logger.debug("Will mock results for this request"); return new ResponseEntity<>(mockSearch.mockSearch(params, getSearchType() == NewznabResponse.SearchType.NEWZNAB), HttpStatus.OK); } if (params.getCachetime() != null || configProvider.getBaseConfig().getSearching().getGlobalCacheTimeMinutes().isPresent()) { return handleCachingSearch(params, searchType, searchRequestId); } NewznabResponse searchResult = search(params, searchRequestId); HttpHeaders httpHeaders = setSearchTypeAndGetHeaders(params, searchResult); return new ResponseEntity<>(searchResult, httpHeaders, HttpStatus.OK); } if (params.getT() == ActionAttribute.GET) { return getNzb(params); } logger.error("Incorrect API request: {}", params); NewznabXmlError error = new NewznabXmlError("200", "Unknown or incorrect parameter"); return new ResponseEntity<Object>(error, HttpStatus.OK); } @RequestMapping(value = {"/api", "/rss", "/torznab/api", "/torznab/api/{indexerName}", "/api/{indexerName}"}, consumes = MediaType.ALL_VALUE) ResponseEntity<? extends Object> api(NewznabParameters params, @PathVariable(value = "indexerName", required = false) String indexerName, @PathVariable(value = "mock", required = false) String mock); static void setInMockingMode(boolean newValue); @ExceptionHandler(value = ExternalApiException.class) NewznabXmlError handler(ExternalApiException e); @ExceptionHandler(value = Exception.class) ResponseEntity handleUnexpectedError(Exception e); } |
@Test public void shouldValidateIndexers() { IndexerConfig indexerConfigMock = mock(IndexerConfig.class); when(indexerConfigMock.validateConfig(any(), any(), any())).thenReturn(new ValidatingConfig.ConfigValidationResult(true, false, new ArrayList<String>(), new ArrayList<String>())); testee.getIndexers().add(indexerConfigMock); testee.validateConfig(new BaseConfig(), testee, new BaseConfig()); verify(indexerConfigMock).validateConfig(any(), any(), any()); } | @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } void replace(BaseConfig newConfig); void save(boolean saveInstantly); @PostConstruct void init(); void load(); @EventListener void onShutdown(ShutdownEvent event); @Override ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig); @Override BaseConfig prepareForSaving(BaseConfig oldBaseConfig); @Override BaseConfig updateAfterLoading(); @Override BaseConfig initializeNewConfig(); } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } void replace(BaseConfig newConfig); void save(boolean saveInstantly); @PostConstruct void init(); void load(); @EventListener void onShutdown(ShutdownEvent event); @Override ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig); @Override BaseConfig prepareForSaving(BaseConfig oldBaseConfig); @Override BaseConfig updateAfterLoading(); @Override BaseConfig initializeNewConfig(); static boolean isProductive; } |
@Test public void shouldCheckIfDisabledBySystem() { when(searchingConfig.isIgnoreTemporarilyDisabled()).thenReturn(false); indexerConfigMock.setState(IndexerConfig.State.ENABLED); indexerConfigMock.setDisabledUntil(null); assertTrue(testee.checkIndexerStatus(indexer)); indexerConfigMock.setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); indexerConfigMock.setDisabledUntil(Instant.now().plus(1, ChronoUnit.DAYS).toEpochMilli()); assertFalse(testee.checkIndexerStatus(indexer)); indexerConfigMock.setState(IndexerConfig.State.DISABLED_SYSTEM); assertFalse(testee.checkIndexerStatus(indexer)); } | protected boolean checkIndexerStatus(Indexer indexer) { if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY) { if (indexer.getConfig().getDisabledUntil() == null || Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil()).isBefore(clock.instant())) { return true; } String message = String.format("Not using %s because it's disabled until %s due to a previous error ", indexer.getName(), Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil())); return handleIndexerNotSelected(indexer, message, "Disabled temporarily because of previous errors"); } if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM) { String message = String.format("Not using %s because it's disabled due to a previous unrecoverable error", indexer.getName()); return handleIndexerNotSelected(indexer, message, "Disabled permanently because of previous unrecoverable error"); } return true; } | IndexerForSearchSelector { protected boolean checkIndexerStatus(Indexer indexer) { if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY) { if (indexer.getConfig().getDisabledUntil() == null || Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil()).isBefore(clock.instant())) { return true; } String message = String.format("Not using %s because it's disabled until %s due to a previous error ", indexer.getName(), Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil())); return handleIndexerNotSelected(indexer, message, "Disabled temporarily because of previous errors"); } if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM) { String message = String.format("Not using %s because it's disabled due to a previous unrecoverable error", indexer.getName()); return handleIndexerNotSelected(indexer, message, "Disabled permanently because of previous unrecoverable error"); } return true; } } | IndexerForSearchSelector { protected boolean checkIndexerStatus(Indexer indexer) { if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY) { if (indexer.getConfig().getDisabledUntil() == null || Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil()).isBefore(clock.instant())) { return true; } String message = String.format("Not using %s because it's disabled until %s due to a previous error ", indexer.getName(), Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil())); return handleIndexerNotSelected(indexer, message, "Disabled temporarily because of previous errors"); } if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM) { String message = String.format("Not using %s because it's disabled due to a previous unrecoverable error", indexer.getName()); return handleIndexerNotSelected(indexer, message, "Disabled permanently because of previous unrecoverable error"); } return true; } } | IndexerForSearchSelector { protected boolean checkIndexerStatus(Indexer indexer) { if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY) { if (indexer.getConfig().getDisabledUntil() == null || Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil()).isBefore(clock.instant())) { return true; } String message = String.format("Not using %s because it's disabled until %s due to a previous error ", indexer.getName(), Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil())); return handleIndexerNotSelected(indexer, message, "Disabled temporarily because of previous errors"); } if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM) { String message = String.format("Not using %s because it's disabled due to a previous unrecoverable error", indexer.getName()); return handleIndexerNotSelected(indexer, message, "Disabled permanently because of previous unrecoverable error"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkIndexerStatus(Indexer indexer) { if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY) { if (indexer.getConfig().getDisabledUntil() == null || Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil()).isBefore(clock.instant())) { return true; } String message = String.format("Not using %s because it's disabled until %s due to a previous error ", indexer.getName(), Instant.ofEpochMilli(indexer.getConfig().getDisabledUntil())); return handleIndexerNotSelected(indexer, message, "Disabled temporarily because of previous errors"); } if (indexer.getConfig().getState() == IndexerConfig.State.DISABLED_SYSTEM) { String message = String.format("Not using %s because it's disabled due to a previous unrecoverable error", indexer.getName()); return handleIndexerNotSelected(indexer, message, "Disabled permanently because of previous unrecoverable error"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldRecognizeDuplicateIndexerNames() { IndexerConfig indexerConfigMock = mock(IndexerConfig.class); when(indexerConfigMock.getName()).thenReturn("name"); IndexerConfig indexerConfigMock2 = mock(IndexerConfig.class); when(indexerConfigMock2.getName()).thenReturn("name"); when(indexerConfigMock.validateConfig(any(), any(), any())).thenReturn(new ValidatingConfig.ConfigValidationResult(true, false, new ArrayList<String>(), new ArrayList<String>())); when(indexerConfigMock2.validateConfig(any(), any(), any())).thenReturn(new ValidatingConfig.ConfigValidationResult(true, false, new ArrayList<String>(), new ArrayList<String>())); testee.getIndexers().add(indexerConfigMock); testee.getIndexers().add(indexerConfigMock2); ValidatingConfig.ConfigValidationResult result = testee.validateConfig(new BaseConfig(), testee, new BaseConfig()); assertEquals(3, result.getErrorMessages().size()); assertTrue(result.getErrorMessages().get(2).contains("Duplicate")); } | @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } void replace(BaseConfig newConfig); void save(boolean saveInstantly); @PostConstruct void init(); void load(); @EventListener void onShutdown(ShutdownEvent event); @Override ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig); @Override BaseConfig prepareForSaving(BaseConfig oldBaseConfig); @Override BaseConfig updateAfterLoading(); @Override BaseConfig initializeNewConfig(); } | BaseConfig extends ValidatingConfig<BaseConfig> { @Override public ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig) { ConfigValidationResult configValidationResult = new ConfigValidationResult(); ConfigValidationResult authValidation = newConfig.getAuth().validateConfig(oldConfig, newConfig.getAuth(), newBaseConfig); configValidationResult.getErrorMessages().addAll(authValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(authValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || authValidation.isRestartNeeded()); ConfigValidationResult categoriesValidation = newConfig.getCategoriesConfig().validateConfig(oldConfig, newConfig.getCategoriesConfig(), newBaseConfig); configValidationResult.getErrorMessages().addAll(categoriesValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(categoriesValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || categoriesValidation.isRestartNeeded()); ConfigValidationResult mainValidation = newConfig.getMain().validateConfig(oldConfig, newConfig.getMain(), newBaseConfig); configValidationResult.getErrorMessages().addAll(mainValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(mainValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || mainValidation.isRestartNeeded()); ConfigValidationResult searchingValidation = newConfig.getSearching().validateConfig(oldConfig, newConfig.getSearching(), newBaseConfig); configValidationResult.getErrorMessages().addAll(searchingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(searchingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || searchingValidation.isRestartNeeded()); ConfigValidationResult downloadingValidation = newConfig.getDownloading().validateConfig(oldConfig, newConfig.getDownloading(), newBaseConfig); configValidationResult.getErrorMessages().addAll(downloadingValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(downloadingValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || downloadingValidation.isRestartNeeded()); for (IndexerConfig indexer : newConfig.getIndexers()) { ConfigValidationResult indexerValidation = indexer.validateConfig(oldConfig, indexer, newBaseConfig); configValidationResult.getErrorMessages().addAll(indexerValidation.getErrorMessages()); configValidationResult.getWarningMessages().addAll(indexerValidation.getWarningMessages()); configValidationResult.setRestartNeeded(configValidationResult.isRestartNeeded() || indexerValidation.isRestartNeeded()); } validateIndexers(newConfig, configValidationResult); if (!configValidationResult.getErrorMessages().isEmpty()) { logger.warn("Config validation returned errors:\n" + Joiner.on("\n").join(configValidationResult.getErrorMessages())); } if (!configValidationResult.getWarningMessages().isEmpty()) { logger.warn("Config validation returned warnings:\n" + Joiner.on("\n").join(configValidationResult.getWarningMessages())); } if (configValidationResult.isRestartNeeded()) { logger.warn("Settings were changed that require a restart to become effective"); } configValidationResult.setOk(configValidationResult.getErrorMessages().isEmpty()); return configValidationResult; } void replace(BaseConfig newConfig); void save(boolean saveInstantly); @PostConstruct void init(); void load(); @EventListener void onShutdown(ShutdownEvent event); @Override ConfigValidationResult validateConfig(BaseConfig oldConfig, BaseConfig newConfig, BaseConfig newBaseConfig); @Override BaseConfig prepareForSaving(BaseConfig oldBaseConfig); @Override BaseConfig updateAfterLoading(); @Override BaseConfig initializeNewConfig(); static boolean isProductive; } |
@Test public void shouldMigrate() { BaseConfig input = new BaseConfig(); input.getMain().setConfigVersion(1); BaseConfig afterMigration = new BaseConfig(); afterMigration.getMain().setConfigVersion(2); Map<String, Object> map = objectMapper.convertValue(input, typeRef); when(configMigrationStepMock.forVersion()).thenReturn(1); when(configMigrationStepMock.migrate(any())).thenReturn(map); testee.steps = Arrays.asList(configMigrationStepMock); testee.expectedConfigVersion = 2; Map<String, Object> result = testee.migrate(map); input = objectMapper.convertValue(result, BaseConfig.class); verify(configMigrationStepMock).migrate(map); assertThat(input.getMain().getConfigVersion()).isEqualTo(2); } | public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } |
@Test(expected = RuntimeException.class) public void shouldThrowExceptionIfWrongConfigVersionAfterMigration() { BaseConfig input = new BaseConfig(); input.getMain().setConfigVersion(1); Map<String, Object> map = objectMapper.convertValue(input, typeRef); testee.steps = Collections.emptyList(); testee.expectedConfigVersion = 2; testee.migrate(map); } | public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } | ConfigMigration { public Map<String, Object> migrate(Map<String, Object> map) { int foundConfigVersion = (int) ((Map<String, Object>) map.get("main")).get("configVersion"); if (foundConfigVersion > expectedConfigVersion) { throw new RuntimeException("The existing config file has version " + foundConfigVersion + " but the program expects version " + expectedConfigVersion + ". You might be trying to use an older code base with settings created by a newer version of the program"); } for (ConfigMigrationStep step : steps) { if (foundConfigVersion <= step.forVersion()) { logger.info("Migrating config from version {}", step.forVersion()); map = step.migrate(map); foundConfigVersion = step.forVersion() + 1; } ((Map<String, Object>) map.get("main")).put("configVersion", foundConfigVersion); } if (foundConfigVersion != expectedConfigVersion) { throw new RuntimeException(String.format("Expected the config after migration to be at version %d but it's at version %d", expectedConfigVersion, foundConfigVersion)); } return map; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } |
@Test public void shouldFindMigrationStepsForAllPossibleConfigVersions() { Integer currentConfigVersion = new MainConfig().getConfigVersion(); List<ConfigMigrationStep> steps = ConfigMigration.getMigrationSteps(); for (int i = 3; i < currentConfigVersion; i++) { int finalI = i; assertThat(steps.stream().anyMatch(x -> x.forVersion() == finalI)).isTrue(); } } | protected static List<ConfigMigrationStep> getMigrationSteps() { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AssignableTypeFilter(ConfigMigrationStep.class)); Set<BeanDefinition> candidates = provider.findCandidateComponents(ConfigMigrationStep.class.getPackage().getName()); List<ConfigMigrationStep> steps = new ArrayList<>(); for (BeanDefinition beanDefinition : candidates) { try { ConfigMigrationStep instance = (ConfigMigrationStep) Class.forName(beanDefinition.getBeanClassName()).getConstructor().newInstance(); steps.add(instance); } catch (Exception e) { logger.error("Unable to instantiate migration step from class " + beanDefinition.getBeanClassName(), e); } } Collections.sort(steps); return steps; } | ConfigMigration { protected static List<ConfigMigrationStep> getMigrationSteps() { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AssignableTypeFilter(ConfigMigrationStep.class)); Set<BeanDefinition> candidates = provider.findCandidateComponents(ConfigMigrationStep.class.getPackage().getName()); List<ConfigMigrationStep> steps = new ArrayList<>(); for (BeanDefinition beanDefinition : candidates) { try { ConfigMigrationStep instance = (ConfigMigrationStep) Class.forName(beanDefinition.getBeanClassName()).getConstructor().newInstance(); steps.add(instance); } catch (Exception e) { logger.error("Unable to instantiate migration step from class " + beanDefinition.getBeanClassName(), e); } } Collections.sort(steps); return steps; } } | ConfigMigration { protected static List<ConfigMigrationStep> getMigrationSteps() { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AssignableTypeFilter(ConfigMigrationStep.class)); Set<BeanDefinition> candidates = provider.findCandidateComponents(ConfigMigrationStep.class.getPackage().getName()); List<ConfigMigrationStep> steps = new ArrayList<>(); for (BeanDefinition beanDefinition : candidates) { try { ConfigMigrationStep instance = (ConfigMigrationStep) Class.forName(beanDefinition.getBeanClassName()).getConstructor().newInstance(); steps.add(instance); } catch (Exception e) { logger.error("Unable to instantiate migration step from class " + beanDefinition.getBeanClassName(), e); } } Collections.sort(steps); return steps; } ConfigMigration(); } | ConfigMigration { protected static List<ConfigMigrationStep> getMigrationSteps() { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AssignableTypeFilter(ConfigMigrationStep.class)); Set<BeanDefinition> candidates = provider.findCandidateComponents(ConfigMigrationStep.class.getPackage().getName()); List<ConfigMigrationStep> steps = new ArrayList<>(); for (BeanDefinition beanDefinition : candidates) { try { ConfigMigrationStep instance = (ConfigMigrationStep) Class.forName(beanDefinition.getBeanClassName()).getConstructor().newInstance(); steps.add(instance); } catch (Exception e) { logger.error("Unable to instantiate migration step from class " + beanDefinition.getBeanClassName(), e); } } Collections.sort(steps); return steps; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } | ConfigMigration { protected static List<ConfigMigrationStep> getMigrationSteps() { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AssignableTypeFilter(ConfigMigrationStep.class)); Set<BeanDefinition> candidates = provider.findCandidateComponents(ConfigMigrationStep.class.getPackage().getName()); List<ConfigMigrationStep> steps = new ArrayList<>(); for (BeanDefinition beanDefinition : candidates) { try { ConfigMigrationStep instance = (ConfigMigrationStep) Class.forName(beanDefinition.getBeanClassName()).getConstructor().newInstance(); steps.add(instance); } catch (Exception e) { logger.error("Unable to instantiate migration step from class " + beanDefinition.getBeanClassName(), e); } } Collections.sort(steps); return steps; } ConfigMigration(); Map<String, Object> migrate(Map<String, Object> map); } |
@Test public void migrate() throws Exception { String yaml = Resources.toString(ConfigMigrationStep005to006Test.class.getResource("migrate5to6.yaml"), Charset.defaultCharset()); Map<String, Object> map = Jackson.YAML_MAPPER.readValue(yaml, ConfigReaderWriter.MAP_TYPE_REFERENCE); Map<String, Object> migrated = testee.migrate(map); String newYaml = Jackson.YAML_MAPPER.writeValueAsString(migrated); BaseConfig baseConfig = Jackson.YAML_MAPPER.readValue(newYaml, BaseConfig.class); assertThat(baseConfig.getCategoriesConfig().getCategories().get(0).getNewznabCategories().get(0).get(0)).isEqualTo(1000); assertThat(baseConfig.getCategoriesConfig().getCategories().get(1).getNewznabCategories().get(0).get(0)).isEqualTo(3000); assertThat(baseConfig.getCategoriesConfig().getCategories().get(1).getNewznabCategories().get(1).get(0)).isEqualTo(3030); } | @Override public Map<String, Object> migrate(Map<String, Object> toMigrate) { Map<String, Object> categoriesConfig = getFromMap(toMigrate, "categoriesConfig"); List<Map<String, Object>> categories = getListFromMap(categoriesConfig, "categories"); for (Map<String, Object> category : categories) { List<Integer> existingNumbers = (List<Integer>) category.get("newznabCategories"); category.put("newznabCategories", existingNumbers.stream().map(Object::toString).collect(Collectors.toList())); } return toMigrate; } | ConfigMigrationStep005to006 implements ConfigMigrationStep { @Override public Map<String, Object> migrate(Map<String, Object> toMigrate) { Map<String, Object> categoriesConfig = getFromMap(toMigrate, "categoriesConfig"); List<Map<String, Object>> categories = getListFromMap(categoriesConfig, "categories"); for (Map<String, Object> category : categories) { List<Integer> existingNumbers = (List<Integer>) category.get("newznabCategories"); category.put("newznabCategories", existingNumbers.stream().map(Object::toString).collect(Collectors.toList())); } return toMigrate; } } | ConfigMigrationStep005to006 implements ConfigMigrationStep { @Override public Map<String, Object> migrate(Map<String, Object> toMigrate) { Map<String, Object> categoriesConfig = getFromMap(toMigrate, "categoriesConfig"); List<Map<String, Object>> categories = getListFromMap(categoriesConfig, "categories"); for (Map<String, Object> category : categories) { List<Integer> existingNumbers = (List<Integer>) category.get("newznabCategories"); category.put("newznabCategories", existingNumbers.stream().map(Object::toString).collect(Collectors.toList())); } return toMigrate; } } | ConfigMigrationStep005to006 implements ConfigMigrationStep { @Override public Map<String, Object> migrate(Map<String, Object> toMigrate) { Map<String, Object> categoriesConfig = getFromMap(toMigrate, "categoriesConfig"); List<Map<String, Object>> categories = getListFromMap(categoriesConfig, "categories"); for (Map<String, Object> category : categories) { List<Integer> existingNumbers = (List<Integer>) category.get("newznabCategories"); category.put("newznabCategories", existingNumbers.stream().map(Object::toString).collect(Collectors.toList())); } return toMigrate; } @Override int forVersion(); @Override Map<String, Object> migrate(Map<String, Object> toMigrate); } | ConfigMigrationStep005to006 implements ConfigMigrationStep { @Override public Map<String, Object> migrate(Map<String, Object> toMigrate) { Map<String, Object> categoriesConfig = getFromMap(toMigrate, "categoriesConfig"); List<Map<String, Object>> categories = getListFromMap(categoriesConfig, "categories"); for (Map<String, Object> category : categories) { List<Integer> existingNumbers = (List<Integer>) category.get("newznabCategories"); category.put("newznabCategories", existingNumbers.stream().map(Object::toString).collect(Collectors.toList())); } return toMigrate; } @Override int forVersion(); @Override Map<String, Object> migrate(Map<String, Object> toMigrate); } |
@Test public void getNews() throws Exception { List<NewsEntry> entries = testee.getNews(); assertThat(entries.size(), is(3)); assertThat(entries.get(0).getNewsAsMarkdown(), is("news3.0.0")); assertThat(entries.get(0).getShowForVersion().major, is(3)); } | public List<NewsEntry> getNews() throws IOException { if (Instant.now().minus(2, ChronoUnit.HOURS).isAfter(lastCheckedForNews)) { newsEntries = webAccess.callUrl(newsUrl, new TypeReference<List<NewsEntry>>() { }); newsEntries.sort(Comparator.comparing(NewsEntry::getShowForVersion).reversed()); lastCheckedForNews = Instant.now(); } return newsEntries; } | NewsProvider { public List<NewsEntry> getNews() throws IOException { if (Instant.now().minus(2, ChronoUnit.HOURS).isAfter(lastCheckedForNews)) { newsEntries = webAccess.callUrl(newsUrl, new TypeReference<List<NewsEntry>>() { }); newsEntries.sort(Comparator.comparing(NewsEntry::getShowForVersion).reversed()); lastCheckedForNews = Instant.now(); } return newsEntries; } } | NewsProvider { public List<NewsEntry> getNews() throws IOException { if (Instant.now().minus(2, ChronoUnit.HOURS).isAfter(lastCheckedForNews)) { newsEntries = webAccess.callUrl(newsUrl, new TypeReference<List<NewsEntry>>() { }); newsEntries.sort(Comparator.comparing(NewsEntry::getShowForVersion).reversed()); lastCheckedForNews = Instant.now(); } return newsEntries; } } | NewsProvider { public List<NewsEntry> getNews() throws IOException { if (Instant.now().minus(2, ChronoUnit.HOURS).isAfter(lastCheckedForNews)) { newsEntries = webAccess.callUrl(newsUrl, new TypeReference<List<NewsEntry>>() { }); newsEntries.sort(Comparator.comparing(NewsEntry::getShowForVersion).reversed()); lastCheckedForNews = Instant.now(); } return newsEntries; } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } | NewsProvider { public List<NewsEntry> getNews() throws IOException { if (Instant.now().minus(2, ChronoUnit.HOURS).isAfter(lastCheckedForNews)) { newsEntries = webAccess.callUrl(newsUrl, new TypeReference<List<NewsEntry>>() { }); newsEntries.sort(Comparator.comparing(NewsEntry::getShowForVersion).reversed()); lastCheckedForNews = Instant.now(); } return newsEntries; } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } |
@Test public void shouldOnlyGetNewsNewerThanShownButNotNewerThanCurrentVersion() throws Exception { when(updateManagerMock.getCurrentVersionString()).thenReturn("2.0.0"); when(shownNewsRepositoryMock.findAll()).thenReturn(Collections.singletonList(new ShownNews("1.0.0"))); List<NewsEntry> entries = testee.getNewsForCurrentVersionAndAfter(); assertThat(entries.size(), is(1)); assertThat(entries.get(0).getNewsAsMarkdown(), is("news2.0.0")); } | public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } |
@Test public void shouldOnlyGetNewstNotNewerThanCurrentVersion() throws Exception { when(updateManagerMock.getCurrentVersionString()).thenReturn("2.0.0"); when(shownNewsRepositoryMock.findAll()).thenReturn(Collections.singletonList(new ShownNews("0.0.1"))); List<NewsEntry> entries = testee.getNewsForCurrentVersionAndAfter(); assertThat(entries.size(), is(2)); assertThat(entries.get(0).getNewsAsMarkdown(), is("news2.0.0")); assertThat(entries.get(1).getNewsAsMarkdown(), is("news1.0.0")); } | public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } |
@Test public void shouldNoNewsWhenNewInstall() throws Exception { when(updateManagerMock.getCurrentVersionString()).thenReturn("2.0.0"); when(shownNewsRepositoryMock.findAll()).thenReturn(Collections.emptyList()); List<NewsEntry> entries = testee.getNewsForCurrentVersionAndAfter(); assertThat(entries.size(), is(0)); } | public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } |
@Test public void shouldNotGetNewsWhenAlreadyShown() throws Exception { when(updateManagerMock.getCurrentVersionString()).thenReturn("3.0.0"); when(shownNewsRepositoryMock.findAll()).thenReturn(Collections.singletonList(new ShownNews("3.0.0"))); List<NewsEntry> entries = testee.getNewsForCurrentVersionAndAfter(); assertThat(entries.size(), is(0)); } | public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } | NewsProvider { public List<NewsEntry> getNewsForCurrentVersionAndAfter() throws IOException { List<ShownNews> shownNews = shownNewsRepository.findAll(); if (shownNews == null || shownNews.isEmpty()) { return Collections.emptyList(); } SemanticVersion from = shownNews.size() == 1 ? new SemanticVersion(shownNews.get(0).getVersion()) : null; SemanticVersion to = new SemanticVersion(updateManager.getCurrentVersionString()); List<NewsEntry> news = getNews(); return news.stream() .filter(x -> isShowNewsEntry(from, to, x)) .collect(Collectors.toList()); } List<NewsEntry> getNews(); void saveShownForCurrentVersion(); List<NewsEntry> getNewsForCurrentVersionAndAfter(); } |
@Test public void shouldCheckForCategory() { when(searchRequest.getCategory()).thenReturn(category); indexerConfigMock.setEnabledCategories(Collections.emptyList()); assertTrue(testee.checkDisabledForCategory(indexer)); indexerConfigMock.setEnabledCategories(Arrays.asList("anotherCategory")); assertFalse(testee.checkDisabledForCategory(indexer)); indexerConfigMock.setEnabledCategories(Arrays.asList(("category"))); assertTrue(testee.checkDisabledForCategory(indexer)); } | protected boolean checkDisabledForCategory(Indexer indexer) { if (searchRequest.getCategory().getSubtype().equals(Subtype.ALL)) { return true; } boolean indexerDisabledForThisCategory = !indexer.getConfig().getEnabledCategories().isEmpty() && !indexer.getConfig().getEnabledCategories().contains(searchRequest.getCategory().getName()); if (indexerDisabledForThisCategory) { String message = String.format("Not using %s because it's disabled for category %s", indexer.getName(), searchRequest.getCategory().getName()); return handleIndexerNotSelected(indexer, message, "Disabled for category"); } return true; } | IndexerForSearchSelector { protected boolean checkDisabledForCategory(Indexer indexer) { if (searchRequest.getCategory().getSubtype().equals(Subtype.ALL)) { return true; } boolean indexerDisabledForThisCategory = !indexer.getConfig().getEnabledCategories().isEmpty() && !indexer.getConfig().getEnabledCategories().contains(searchRequest.getCategory().getName()); if (indexerDisabledForThisCategory) { String message = String.format("Not using %s because it's disabled for category %s", indexer.getName(), searchRequest.getCategory().getName()); return handleIndexerNotSelected(indexer, message, "Disabled for category"); } return true; } } | IndexerForSearchSelector { protected boolean checkDisabledForCategory(Indexer indexer) { if (searchRequest.getCategory().getSubtype().equals(Subtype.ALL)) { return true; } boolean indexerDisabledForThisCategory = !indexer.getConfig().getEnabledCategories().isEmpty() && !indexer.getConfig().getEnabledCategories().contains(searchRequest.getCategory().getName()); if (indexerDisabledForThisCategory) { String message = String.format("Not using %s because it's disabled for category %s", indexer.getName(), searchRequest.getCategory().getName()); return handleIndexerNotSelected(indexer, message, "Disabled for category"); } return true; } } | IndexerForSearchSelector { protected boolean checkDisabledForCategory(Indexer indexer) { if (searchRequest.getCategory().getSubtype().equals(Subtype.ALL)) { return true; } boolean indexerDisabledForThisCategory = !indexer.getConfig().getEnabledCategories().isEmpty() && !indexer.getConfig().getEnabledCategories().contains(searchRequest.getCategory().getName()); if (indexerDisabledForThisCategory) { String message = String.format("Not using %s because it's disabled for category %s", indexer.getName(), searchRequest.getCategory().getName()); return handleIndexerNotSelected(indexer, message, "Disabled for category"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkDisabledForCategory(Indexer indexer) { if (searchRequest.getCategory().getSubtype().equals(Subtype.ALL)) { return true; } boolean indexerDisabledForThisCategory = !indexer.getConfig().getEnabledCategories().isEmpty() && !indexer.getConfig().getEnabledCategories().contains(searchRequest.getCategory().getName()); if (indexerDisabledForThisCategory) { String message = String.format("Not using %s because it's disabled for category %s", indexer.getName(), searchRequest.getCategory().getName()); return handleIndexerNotSelected(indexer, message, "Disabled for category"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void testGeneration() throws Exception { Xml xml = testee.getAndStoreResultToDatabase(URI.create("http: NewznabXmlRoot root = (NewznabXmlRoot) xml; System.out.println(root); } | protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { NewznabXmlRoot rssRoot = new NewznabXmlRoot(); if (uri.toString().contains("oneduplicate")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(1); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); } else if (uri.toString().contains("duplicatesandtitlegroups")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "100")); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot3 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot3.getRssChannel().getItems().get(0).getEnclosure().setLength(200000L); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "2000")); rssRoot3.getRssChannel().getItems().get(0).setLink("anotherlink"); rssRoot.getRssChannel().getItems().add(rssRoot3.getRssChannel().getItems().get(0)); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("anotherresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot2 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().add(rssRoot2.getRssChannel().getItems().get(0)); rssRoot.getRssChannel().getNewznabResponse().setTotal(3); } else if (uri.toString().contains("duplicates")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(10).titleBase("duplicates").titleWords(Collections.emptyList()).total(10).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(10); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { rssItem.getEnclosure().setLength(100000L); rssItem.getNewznabAttributes().clear(); rssItem.setPubDate(Instant.now()); rssItem.setDescription("Indexer: " + getName() + ", title:" + rssItem.getTitle()); } } else if (uri.toString().contains("tworesults")) { rssRoot = NewznabMockBuilder.generateResponse(0, 2, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(2); } else { rssRoot = NewznabMockBuilder.generateResponse(0, 100, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(100); } if (uri.toString().contains("punkte")) { rssRoot.getRssChannel().getItems().get(0).setTitle("a a"); rssRoot.getRssChannel().getItems().get(1).setTitle("ab"); rssRoot.getRssChannel().getItems().get(2).setTitle("a.c"); } return rssRoot; } | DevIndexer extends Newznab { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { NewznabXmlRoot rssRoot = new NewznabXmlRoot(); if (uri.toString().contains("oneduplicate")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(1); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); } else if (uri.toString().contains("duplicatesandtitlegroups")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "100")); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot3 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot3.getRssChannel().getItems().get(0).getEnclosure().setLength(200000L); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "2000")); rssRoot3.getRssChannel().getItems().get(0).setLink("anotherlink"); rssRoot.getRssChannel().getItems().add(rssRoot3.getRssChannel().getItems().get(0)); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("anotherresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot2 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().add(rssRoot2.getRssChannel().getItems().get(0)); rssRoot.getRssChannel().getNewznabResponse().setTotal(3); } else if (uri.toString().contains("duplicates")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(10).titleBase("duplicates").titleWords(Collections.emptyList()).total(10).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(10); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { rssItem.getEnclosure().setLength(100000L); rssItem.getNewznabAttributes().clear(); rssItem.setPubDate(Instant.now()); rssItem.setDescription("Indexer: " + getName() + ", title:" + rssItem.getTitle()); } } else if (uri.toString().contains("tworesults")) { rssRoot = NewznabMockBuilder.generateResponse(0, 2, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(2); } else { rssRoot = NewznabMockBuilder.generateResponse(0, 100, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(100); } if (uri.toString().contains("punkte")) { rssRoot.getRssChannel().getItems().get(0).setTitle("a a"); rssRoot.getRssChannel().getItems().get(1).setTitle("ab"); rssRoot.getRssChannel().getItems().get(2).setTitle("a.c"); } return rssRoot; } } | DevIndexer extends Newznab { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { NewznabXmlRoot rssRoot = new NewznabXmlRoot(); if (uri.toString().contains("oneduplicate")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(1); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); } else if (uri.toString().contains("duplicatesandtitlegroups")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "100")); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot3 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot3.getRssChannel().getItems().get(0).getEnclosure().setLength(200000L); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "2000")); rssRoot3.getRssChannel().getItems().get(0).setLink("anotherlink"); rssRoot.getRssChannel().getItems().add(rssRoot3.getRssChannel().getItems().get(0)); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("anotherresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot2 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().add(rssRoot2.getRssChannel().getItems().get(0)); rssRoot.getRssChannel().getNewznabResponse().setTotal(3); } else if (uri.toString().contains("duplicates")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(10).titleBase("duplicates").titleWords(Collections.emptyList()).total(10).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(10); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { rssItem.getEnclosure().setLength(100000L); rssItem.getNewznabAttributes().clear(); rssItem.setPubDate(Instant.now()); rssItem.setDescription("Indexer: " + getName() + ", title:" + rssItem.getTitle()); } } else if (uri.toString().contains("tworesults")) { rssRoot = NewznabMockBuilder.generateResponse(0, 2, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(2); } else { rssRoot = NewznabMockBuilder.generateResponse(0, 100, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(100); } if (uri.toString().contains("punkte")) { rssRoot.getRssChannel().getItems().get(0).setTitle("a a"); rssRoot.getRssChannel().getItems().get(1).setTitle("ab"); rssRoot.getRssChannel().getItems().get(2).setTitle("a.c"); } return rssRoot; } } | DevIndexer extends Newznab { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { NewznabXmlRoot rssRoot = new NewznabXmlRoot(); if (uri.toString().contains("oneduplicate")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(1); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); } else if (uri.toString().contains("duplicatesandtitlegroups")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "100")); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot3 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot3.getRssChannel().getItems().get(0).getEnclosure().setLength(200000L); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "2000")); rssRoot3.getRssChannel().getItems().get(0).setLink("anotherlink"); rssRoot.getRssChannel().getItems().add(rssRoot3.getRssChannel().getItems().get(0)); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("anotherresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot2 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().add(rssRoot2.getRssChannel().getItems().get(0)); rssRoot.getRssChannel().getNewznabResponse().setTotal(3); } else if (uri.toString().contains("duplicates")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(10).titleBase("duplicates").titleWords(Collections.emptyList()).total(10).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(10); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { rssItem.getEnclosure().setLength(100000L); rssItem.getNewznabAttributes().clear(); rssItem.setPubDate(Instant.now()); rssItem.setDescription("Indexer: " + getName() + ", title:" + rssItem.getTitle()); } } else if (uri.toString().contains("tworesults")) { rssRoot = NewznabMockBuilder.generateResponse(0, 2, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(2); } else { rssRoot = NewznabMockBuilder.generateResponse(0, 100, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(100); } if (uri.toString().contains("punkte")) { rssRoot.getRssChannel().getItems().get(0).setTitle("a a"); rssRoot.getRssChannel().getItems().get(1).setTitle("ab"); rssRoot.getRssChannel().getItems().get(2).setTitle("a.c"); } return rssRoot; } } | DevIndexer extends Newznab { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { NewznabXmlRoot rssRoot = new NewznabXmlRoot(); if (uri.toString().contains("oneduplicate")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(1); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); } else if (uri.toString().contains("duplicatesandtitlegroups")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().get(0).getEnclosure().setLength(100000L); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "100")); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("oneresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot3 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot3.getRssChannel().getItems().get(0).getEnclosure().setLength(200000L); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getTorznabAttributes().clear(); rssRoot3.getRssChannel().getItems().get(0).getNewznabAttributes().add(new NewznabAttribute("grabs", "2000")); rssRoot3.getRssChannel().getItems().get(0).setLink("anotherlink"); rssRoot.getRssChannel().getItems().add(rssRoot3.getRssChannel().getItems().get(0)); mockRequest = NewznabMockRequest.builder().numberOfResults(1).titleBase("anotherresult").titleWords(Collections.emptyList()).total(1).build(); NewznabXmlRoot rssRoot2 = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getItems().add(rssRoot2.getRssChannel().getItems().get(0)); rssRoot.getRssChannel().getNewznabResponse().setTotal(3); } else if (uri.toString().contains("duplicates")) { NewznabMockRequest mockRequest = NewznabMockRequest.builder().numberOfResults(10).titleBase("duplicates").titleWords(Collections.emptyList()).total(10).build(); rssRoot = NewznabMockBuilder.generateResponse(mockRequest); rssRoot.getRssChannel().getNewznabResponse().setTotal(10); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { rssItem.getEnclosure().setLength(100000L); rssItem.getNewznabAttributes().clear(); rssItem.setPubDate(Instant.now()); rssItem.setDescription("Indexer: " + getName() + ", title:" + rssItem.getTitle()); } } else if (uri.toString().contains("tworesults")) { rssRoot = NewznabMockBuilder.generateResponse(0, 2, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(2); } else { rssRoot = NewznabMockBuilder.generateResponse(0, 100, "results", false, Collections.emptyList(), false, 0); rssRoot.getRssChannel().getNewznabResponse().setTotal(100); } if (uri.toString().contains("punkte")) { rssRoot.getRssChannel().getItems().get(0).setTitle("a a"); rssRoot.getRssChannel().getItems().get(1).setTitle("ab"); rssRoot.getRssChannel().getItems().get(2).setTitle("a.c"); } return rssRoot; } } |
@Test public void shouldParseRows() throws Exception { Instant now = Instant.now(); String enclosureUrl = "https: String link = "https: NewznabXmlRoot root = RssBuilder.builder().items( Arrays.asList( RssItemBuilder .builder("Watchers.of.the.Universe.S02E09.1080p.WEB-DL.DD5.1.AAC2.0.H.264-YFN-0030-Watchers.of.the.Universe.S02E09.Cant.Get.You.out.of.My.Head.1080p.WEB-DL") .link(link) .description("<![CDATA[\n" + "<p><font color=\"gray\">alt.binaries.hdtv.x264</font><br /> <b>1.01 GB</b><br /> 7 hours<br /> <font color=\"#3DA233\">31 files (1405 parts)</font> <font color=\"gray\">by [email protected] (SP)</font><br /> <font color=\"#E2A910\"> 1 NFO | 9 PAR2 | 1 NZB | 19 ARCHIVE</font> - <a href=\"http: "]]>") .category("alt.binaries.hdtv.x264") .pubDate(now) .rssGuid(new NewznabXmlGuid(link, true)) .enclosure(new NewznabXmlEnclosure(enclosureUrl, 1089197181L, "application/x-nzb")) .build())).build(); List<SearchResultItem> items = testee.getSearchResultItems(root, new SearchRequest()); assertThat(items.size(), is(1)); SearchResultItem item = items.get(0); assertThat(item.getTitle(), is("Watchers.of.the.Universe.S02E09.1080p.WEB-DL.DD5.1.AAC2.0.H.264-YFN-0030-Watchers.of.the.Universe.S02E09.Cant.Get.You.out.of.My.Head.1080p.WEB-DL")); assertThat(item.getGroup().get(), is("alt.binaries.hdtv.x264")); assertThat(item.getPubDate(), is(now)); assertThat(item.isAgePrecise(), is(true)); assertThat(item.getSize(), is(1089197181L)); assertThat(item.getIndexerGuid(), is("164950363")); assertThat(item.getDownloadType(), is(DownloadType.NZB)); assertThat(item.getHasNfo(), is(HasNfo.NO)); } | @Override protected List<SearchResultItem> getSearchResultItems(NewznabXmlRoot rssRoot, SearchRequest searchRequest) { if (rssRoot.getRssChannel().getItems() == null || rssRoot.getRssChannel().getItems().isEmpty()) { debug("No results found"); return Collections.emptyList(); } List<SearchResultItem> items = new ArrayList<>(); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { SearchResultItem item = new SearchResultItem(); item.setPubDate(rssItem.getPubDate()); String nzbIndexLink = rssItem.getLink(); item.setTitle(rssItem.getTitle()); item.setAgePrecise(true); if (rssItem.getCategory() != null) { item.setGroup(rssItem.getCategory().replace("a.b", "alt.binaries")); } item.setLink(rssItem.getEnclosure().getUrl()); item.setSize(rssItem.getEnclosure().getLength()); Matcher matcher = GUID_PATTERN.matcher(nzbIndexLink); boolean found = matcher.find(); if (!found) { logger.error("Unable to parse '{}' result for link. Skipping it", nzbIndexLink); continue; } item.setIndexerGuid(matcher.group(1)); item.setCategory(categoryProvider.getNotAvailable()); item.setOriginalCategory("N/A"); item.setIndexerScore(config.getScore()); if (item.getDescription() != null) { item.setHasNfo(rssItem.getDescription().contains("1 NFO") ? HasNfo.YES : HasNfo.NO); } else { item.setHasNfo(HasNfo.NO); } item.setIndexer(this); item.setDownloadType(DownloadType.NZB); items.add(item); } return items; } | NzbIndex extends Indexer<NewznabXmlRoot> { @Override protected List<SearchResultItem> getSearchResultItems(NewznabXmlRoot rssRoot, SearchRequest searchRequest) { if (rssRoot.getRssChannel().getItems() == null || rssRoot.getRssChannel().getItems().isEmpty()) { debug("No results found"); return Collections.emptyList(); } List<SearchResultItem> items = new ArrayList<>(); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { SearchResultItem item = new SearchResultItem(); item.setPubDate(rssItem.getPubDate()); String nzbIndexLink = rssItem.getLink(); item.setTitle(rssItem.getTitle()); item.setAgePrecise(true); if (rssItem.getCategory() != null) { item.setGroup(rssItem.getCategory().replace("a.b", "alt.binaries")); } item.setLink(rssItem.getEnclosure().getUrl()); item.setSize(rssItem.getEnclosure().getLength()); Matcher matcher = GUID_PATTERN.matcher(nzbIndexLink); boolean found = matcher.find(); if (!found) { logger.error("Unable to parse '{}' result for link. Skipping it", nzbIndexLink); continue; } item.setIndexerGuid(matcher.group(1)); item.setCategory(categoryProvider.getNotAvailable()); item.setOriginalCategory("N/A"); item.setIndexerScore(config.getScore()); if (item.getDescription() != null) { item.setHasNfo(rssItem.getDescription().contains("1 NFO") ? HasNfo.YES : HasNfo.NO); } else { item.setHasNfo(HasNfo.NO); } item.setIndexer(this); item.setDownloadType(DownloadType.NZB); items.add(item); } return items; } } | NzbIndex extends Indexer<NewznabXmlRoot> { @Override protected List<SearchResultItem> getSearchResultItems(NewznabXmlRoot rssRoot, SearchRequest searchRequest) { if (rssRoot.getRssChannel().getItems() == null || rssRoot.getRssChannel().getItems().isEmpty()) { debug("No results found"); return Collections.emptyList(); } List<SearchResultItem> items = new ArrayList<>(); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { SearchResultItem item = new SearchResultItem(); item.setPubDate(rssItem.getPubDate()); String nzbIndexLink = rssItem.getLink(); item.setTitle(rssItem.getTitle()); item.setAgePrecise(true); if (rssItem.getCategory() != null) { item.setGroup(rssItem.getCategory().replace("a.b", "alt.binaries")); } item.setLink(rssItem.getEnclosure().getUrl()); item.setSize(rssItem.getEnclosure().getLength()); Matcher matcher = GUID_PATTERN.matcher(nzbIndexLink); boolean found = matcher.find(); if (!found) { logger.error("Unable to parse '{}' result for link. Skipping it", nzbIndexLink); continue; } item.setIndexerGuid(matcher.group(1)); item.setCategory(categoryProvider.getNotAvailable()); item.setOriginalCategory("N/A"); item.setIndexerScore(config.getScore()); if (item.getDescription() != null) { item.setHasNfo(rssItem.getDescription().contains("1 NFO") ? HasNfo.YES : HasNfo.NO); } else { item.setHasNfo(HasNfo.NO); } item.setIndexer(this); item.setDownloadType(DownloadType.NZB); items.add(item); } return items; } } | NzbIndex extends Indexer<NewznabXmlRoot> { @Override protected List<SearchResultItem> getSearchResultItems(NewznabXmlRoot rssRoot, SearchRequest searchRequest) { if (rssRoot.getRssChannel().getItems() == null || rssRoot.getRssChannel().getItems().isEmpty()) { debug("No results found"); return Collections.emptyList(); } List<SearchResultItem> items = new ArrayList<>(); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { SearchResultItem item = new SearchResultItem(); item.setPubDate(rssItem.getPubDate()); String nzbIndexLink = rssItem.getLink(); item.setTitle(rssItem.getTitle()); item.setAgePrecise(true); if (rssItem.getCategory() != null) { item.setGroup(rssItem.getCategory().replace("a.b", "alt.binaries")); } item.setLink(rssItem.getEnclosure().getUrl()); item.setSize(rssItem.getEnclosure().getLength()); Matcher matcher = GUID_PATTERN.matcher(nzbIndexLink); boolean found = matcher.find(); if (!found) { logger.error("Unable to parse '{}' result for link. Skipping it", nzbIndexLink); continue; } item.setIndexerGuid(matcher.group(1)); item.setCategory(categoryProvider.getNotAvailable()); item.setOriginalCategory("N/A"); item.setIndexerScore(config.getScore()); if (item.getDescription() != null) { item.setHasNfo(rssItem.getDescription().contains("1 NFO") ? HasNfo.YES : HasNfo.NO); } else { item.setHasNfo(HasNfo.NO); } item.setIndexer(this); item.setDownloadType(DownloadType.NZB); items.add(item); } return items; } @Override NfoResult getNfo(String guid); } | NzbIndex extends Indexer<NewznabXmlRoot> { @Override protected List<SearchResultItem> getSearchResultItems(NewznabXmlRoot rssRoot, SearchRequest searchRequest) { if (rssRoot.getRssChannel().getItems() == null || rssRoot.getRssChannel().getItems().isEmpty()) { debug("No results found"); return Collections.emptyList(); } List<SearchResultItem> items = new ArrayList<>(); for (NewznabXmlItem rssItem : rssRoot.getRssChannel().getItems()) { SearchResultItem item = new SearchResultItem(); item.setPubDate(rssItem.getPubDate()); String nzbIndexLink = rssItem.getLink(); item.setTitle(rssItem.getTitle()); item.setAgePrecise(true); if (rssItem.getCategory() != null) { item.setGroup(rssItem.getCategory().replace("a.b", "alt.binaries")); } item.setLink(rssItem.getEnclosure().getUrl()); item.setSize(rssItem.getEnclosure().getLength()); Matcher matcher = GUID_PATTERN.matcher(nzbIndexLink); boolean found = matcher.find(); if (!found) { logger.error("Unable to parse '{}' result for link. Skipping it", nzbIndexLink); continue; } item.setIndexerGuid(matcher.group(1)); item.setCategory(categoryProvider.getNotAvailable()); item.setOriginalCategory("N/A"); item.setIndexerScore(config.getScore()); if (item.getDescription() != null) { item.setHasNfo(rssItem.getDescription().contains("1 NFO") ? HasNfo.YES : HasNfo.NO); } else { item.setHasNfo(HasNfo.NO); } item.setIndexer(this); item.setDownloadType(DownloadType.NZB); items.add(item); } return items; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldParseResultsCorrectly() throws Exception { String html = Resources.toString(Resources.getResource(BinsearchTest.class, "/org/nzbhydra/mapping/binsearch.html"), Charsets.UTF_8); List<SearchResultItem> searchResultItems = testee.getSearchResultItems(html, new SearchRequest()); assertThat(searchResultItems.size(), is(1)); SearchResultItem item = searchResultItems.get(0); assertThat(item.getTitle(), is("testtitle. 3D.TOPBOT.TrueFrench.1080p.X264.AC3.5.1-JKF.mkv")); assertThat(item.getLink(), is("https: assertThat(item.getDetails(), is("https: assertThat(item.getSize(), is(12209999872L)); assertThat(item.getIndexerGuid(), is("176073735")); assertThat(item.getPubDate(), is(Instant.ofEpochSecond(1443312000))); assertThat(item.isAgePrecise(), is(false)); assertThat(item.getPoster().get(), is("[email protected] (Clown_nez)")); assertThat(item.getGroup().get(), is("alt.binaries.movies.mkv")); } | @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldParseOtherResultsCorrectly() throws Exception { String html = Resources.toString(Resources.getResource(BinsearchTest.class, "/org/nzbhydra/mapping/binsearch_randm.html"), Charsets.UTF_8); List<SearchResultItem> searchResultItems = testee.getSearchResultItems(html, new SearchRequest()); assertThat(searchResultItems.size(), is(41)); } | @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldRecognizeIfSingleResultPage() throws Exception { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); String html = Resources.toString(Resources.getResource(BinsearchTest.class, "/org/nzbhydra/mapping/binsearch_singlepage.html"), Charsets.UTF_8); IndexerSearchResult indexerSearchResult = new IndexerSearchResult(testee, ""); List<SearchResultItem> items = new ArrayList<>(); for (int i = 0; i < 24; i++) { SearchResultItem searchResultItem = new SearchResultItem(); searchResultItem.setPubDate(Instant.now()); items.add(searchResultItem); } indexerSearchResult.setSearchResultItems(items); testee.completeIndexerSearchResult(html, indexerSearchResult, null, searchRequest, 0, 100); assertThat(indexerSearchResult.getOffset(), is(0)); assertThat(indexerSearchResult.getLimit(), is(100)); assertThat(indexerSearchResult.getTotalResults(), is(24)); assertThat(indexerSearchResult.isTotalResultsKnown(), is(true)); assertThat(indexerSearchResult.isHasMoreResults(), is(false)); } | @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } @Override NfoResult getNfo(String guid); } |
@Test public void shouldRecognizeIfMoreResultsAvailable() throws Exception { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); String html = Resources.toString(Resources.getResource(BinsearchTest.class, "/org/nzbhydra/mapping/binsearch.html"), Charsets.UTF_8); IndexerSearchResult indexerSearchResult = new IndexerSearchResult(testee, ""); testee.completeIndexerSearchResult(html, indexerSearchResult, null, searchRequest, 0, 100); assertThat(indexerSearchResult.isTotalResultsKnown(), is(false)); assertThat(indexerSearchResult.isHasMoreResults(), is(true)); } | @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected void completeIndexerSearchResult(String response, IndexerSearchResult indexerSearchResult, AcceptorResult acceptorResult, SearchRequest searchRequest, int offset, Integer limit) { Document doc = Jsoup.parse(response); if (doc.select("table.xMenuT").size() > 0) { Element navigationTable = doc.select("table.xMenuT").get(1); Elements pageLinks = navigationTable.select("a"); boolean hasMore = !pageLinks.isEmpty() && pageLinks.last().text().equals(">"); boolean totalKnown = false; indexerSearchResult.setOffset(searchRequest.getOffset()); int total = searchRequest.getOffset() + 100; if (!hasMore) { total = searchRequest.getOffset() + indexerSearchResult.getSearchResultItems().size(); totalKnown = true; } indexerSearchResult.setHasMoreResults(hasMore); indexerSearchResult.setTotalResults(total); indexerSearchResult.setTotalResultsKnown(totalKnown); } else { indexerSearchResult.setHasMoreResults(false); indexerSearchResult.setTotalResults(0); indexerSearchResult.setTotalResultsKnown(true); } indexerSearchResult.setLimit(limit); indexerSearchResult.setOffset(offset); } @Override NfoResult getNfo(String guid); } |
@Test public void shouldRecognizeWhenNoResultsFound() throws Exception { String html = Resources.toString(Resources.getResource(BinsearchTest.class, "/org/nzbhydra/mapping/binsearch_noresults.html"), Charsets.UTF_8); List<SearchResultItem> searchResultItems = testee.getSearchResultItems(html, new SearchRequest()); assertThat(searchResultItems, is(empty())); } | @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @SuppressWarnings("ConstantConditions") @Override protected List<SearchResultItem> getSearchResultItems(String searchRequestResponse, SearchRequest searchRequest) throws IndexerParsingException { List<SearchResultItem> items = new ArrayList<>(); Document doc = Jsoup.parse(searchRequestResponse); if (doc.text().contains("No results in most popular groups")) { return Collections.emptyList(); } Elements mainTables = doc.select("table#r2"); if (mainTables.size() == 0) { throw new IndexerParsingException("Unable to find main table in binsearch page. This happens sometimes ;-)"); } Element mainTable = mainTables.get(0); Elements rows = mainTable.select("tr"); for (int i = 1; i < rows.size(); i++) { Element row = rows.get(i); SearchResultItem item = parseRow(row); if (item == null) { continue; } items.add(item); } debug("Finished parsing {} of {} rows", items.size(), rows.size()); return items; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldBuildSimpleQuery() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.setQuery("query"); UriComponentsBuilder builder = testee.buildSearchUrl(searchRequest, 0, 100); assertThat(builder.toUriString(), is("https: } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test public void shouldAddRequiredWords() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getInternalData().setRequiredWords(Arrays.asList("a", "b")); searchRequest.setQuery("query"); UriComponentsBuilder builder = testee.buildSearchUrl(searchRequest, 0, 100); assertThat(builder.build().toString(), is("https: } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerSearchAbortedException.class) public void shouldAbortIfSearchNotPossible() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); testee.buildSearchUrl(searchRequest, 0, 100); } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Binsearch cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test public void shouldCheckForLoadLimiting() { indexerConfigMock.setLoadLimitOnRandom(null); assertTrue(testee.checkLoadLimiting(indexer)); indexerConfigMock.setLoadLimitOnRandom(1); for (int i = 0; i < 50; i++) { assertTrue(testee.checkLoadLimiting(indexer)); } indexerConfigMock.setLoadLimitOnRandom(2); int countNotPicked = 0; for (int i = 0; i < 500; i++) { countNotPicked += testee.checkLoadLimiting(indexer) ? 0 : 1; } assertTrue(countNotPicked > 0); } | protected boolean checkLoadLimiting(Indexer indexer) { boolean preventedByLoadLimiting = indexer.getConfig().getLoadLimitOnRandom().isPresent() && random.nextInt(indexer.getConfig().getLoadLimitOnRandom().get()) + 1 != 1; if (preventedByLoadLimiting) { boolean loadLimitIgnored = configProvider.getBaseConfig().getSearching().isIgnoreLoadLimitingForInternalSearches() && searchRequest.getSource() == SearchSource.INTERNAL; if (loadLimitIgnored) { logger.debug("Ignoring load limiting for internal search"); return true; } String message = String.format("Not using %s because load limiting prevented it. Chances of it being picked: 1/%d", indexer.getName(), indexer.getConfig().getLoadLimitOnRandom().get()); return handleIndexerNotSelected(indexer, message, "Load limiting"); } return true; } | IndexerForSearchSelector { protected boolean checkLoadLimiting(Indexer indexer) { boolean preventedByLoadLimiting = indexer.getConfig().getLoadLimitOnRandom().isPresent() && random.nextInt(indexer.getConfig().getLoadLimitOnRandom().get()) + 1 != 1; if (preventedByLoadLimiting) { boolean loadLimitIgnored = configProvider.getBaseConfig().getSearching().isIgnoreLoadLimitingForInternalSearches() && searchRequest.getSource() == SearchSource.INTERNAL; if (loadLimitIgnored) { logger.debug("Ignoring load limiting for internal search"); return true; } String message = String.format("Not using %s because load limiting prevented it. Chances of it being picked: 1/%d", indexer.getName(), indexer.getConfig().getLoadLimitOnRandom().get()); return handleIndexerNotSelected(indexer, message, "Load limiting"); } return true; } } | IndexerForSearchSelector { protected boolean checkLoadLimiting(Indexer indexer) { boolean preventedByLoadLimiting = indexer.getConfig().getLoadLimitOnRandom().isPresent() && random.nextInt(indexer.getConfig().getLoadLimitOnRandom().get()) + 1 != 1; if (preventedByLoadLimiting) { boolean loadLimitIgnored = configProvider.getBaseConfig().getSearching().isIgnoreLoadLimitingForInternalSearches() && searchRequest.getSource() == SearchSource.INTERNAL; if (loadLimitIgnored) { logger.debug("Ignoring load limiting for internal search"); return true; } String message = String.format("Not using %s because load limiting prevented it. Chances of it being picked: 1/%d", indexer.getName(), indexer.getConfig().getLoadLimitOnRandom().get()); return handleIndexerNotSelected(indexer, message, "Load limiting"); } return true; } } | IndexerForSearchSelector { protected boolean checkLoadLimiting(Indexer indexer) { boolean preventedByLoadLimiting = indexer.getConfig().getLoadLimitOnRandom().isPresent() && random.nextInt(indexer.getConfig().getLoadLimitOnRandom().get()) + 1 != 1; if (preventedByLoadLimiting) { boolean loadLimitIgnored = configProvider.getBaseConfig().getSearching().isIgnoreLoadLimitingForInternalSearches() && searchRequest.getSource() == SearchSource.INTERNAL; if (loadLimitIgnored) { logger.debug("Ignoring load limiting for internal search"); return true; } String message = String.format("Not using %s because load limiting prevented it. Chances of it being picked: 1/%d", indexer.getName(), indexer.getConfig().getLoadLimitOnRandom().get()); return handleIndexerNotSelected(indexer, message, "Load limiting"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkLoadLimiting(Indexer indexer) { boolean preventedByLoadLimiting = indexer.getConfig().getLoadLimitOnRandom().isPresent() && random.nextInt(indexer.getConfig().getLoadLimitOnRandom().get()) + 1 != 1; if (preventedByLoadLimiting) { boolean loadLimitIgnored = configProvider.getBaseConfig().getSearching().isIgnoreLoadLimitingForInternalSearches() && searchRequest.getSource() == SearchSource.INTERNAL; if (loadLimitIgnored) { logger.debug("Ignoring load limiting for internal search"); return true; } String message = String.format("Not using %s because load limiting prevented it. Chances of it being picked: 1/%d", indexer.getName(), indexer.getConfig().getLoadLimitOnRandom().get()); return handleIndexerNotSelected(indexer, message, "Load limiting"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test(expected = FailsafeException.class) public void shouldRetryOn503() throws Exception { testee = spy(testee); doThrow(new IndexerAccessException("503")).when(testee).getAndStoreResultToDatabase(uriCaptor.capture(), any(), any()); testee.getAndStoreResultToDatabase(null, IndexerApiAccessType.NFO); } | @Override protected String getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { return Failsafe.with(retry503policy) .onFailedAttempt(throwable -> logger.warn("Encountered 503 error. Will retry")) .get(() -> getAndStoreResultToDatabase(uri, String.class, apiAccessType)); } | Binsearch extends Indexer<String> { @Override protected String getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { return Failsafe.with(retry503policy) .onFailedAttempt(throwable -> logger.warn("Encountered 503 error. Will retry")) .get(() -> getAndStoreResultToDatabase(uri, String.class, apiAccessType)); } } | Binsearch extends Indexer<String> { @Override protected String getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { return Failsafe.with(retry503policy) .onFailedAttempt(throwable -> logger.warn("Encountered 503 error. Will retry")) .get(() -> getAndStoreResultToDatabase(uri, String.class, apiAccessType)); } } | Binsearch extends Indexer<String> { @Override protected String getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { return Failsafe.with(retry503policy) .onFailedAttempt(throwable -> logger.warn("Encountered 503 error. Will retry")) .get(() -> getAndStoreResultToDatabase(uri, String.class, apiAccessType)); } @Override NfoResult getNfo(String guid); } | Binsearch extends Indexer<String> { @Override protected String getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { return Failsafe.with(retry503policy) .onFailedAttempt(throwable -> logger.warn("Encountered 503 error. Will retry")) .get(() -> getAndStoreResultToDatabase(uri, String.class, apiAccessType)); } @Override NfoResult getNfo(String guid); } |
@Test public void shouldCreateNewSearchResultEntityWhenNoneIsFound() throws Exception { SearchResultItem item = new SearchResultItem(); item.setIndexer(indexerMock); item.setTitle("title"); item.setDetails("details"); item.setIndexerGuid("guid"); testee.persistSearchResults(Collections.singletonList(item), new IndexerSearchResult()); verify(searchResultRepositoryMock).saveAll(searchResultEntitiesCaptor.capture()); List<SearchResultEntity> persistedEntities = searchResultEntitiesCaptor.getValue(); assertThat(persistedEntities.size(), is(1)); assertThat(persistedEntities.get(0).getTitle(), is("title")); assertThat(persistedEntities.get(0).getDetails(), is("details")); assertThat(persistedEntities.get(0).getIndexerGuid(), is("guid")); } | @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } |
@Test public void shouldNotCreateNewSearchResultEntityWhenOneExists() throws Exception { SearchResultItem item = new SearchResultItem(); item.setIndexerGuid("guid"); item.setIndexer(indexerMock); when(searchResultEntityMock.getIndexerGuid()).thenReturn("guid"); when(searchResultRepositoryMock.findAllIdsByIdIn(anyList())).thenReturn(Sets.newHashSet(299225959498991027L)); testee.persistSearchResults(Collections.singletonList(item), new IndexerSearchResult()); verify(searchResultRepositoryMock).saveAll(searchResultEntitiesCaptor.capture()); List<SearchResultEntity> persistedEntities = searchResultEntitiesCaptor.getValue(); assertThat(persistedEntities.size(), is(0)); } | @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | Indexer { @Transactional protected List<SearchResultItem> persistSearchResults(List<SearchResultItem> searchResultItems, IndexerSearchResult indexerSearchResult) { Stopwatch stopwatch = Stopwatch.createStarted(); synchronized (dbLock) { ArrayList<SearchResultEntity> searchResultEntities = new ArrayList<>(); Set<Long> alreadySavedIds = searchResultRepository.findAllIdsByIdIn(searchResultItems.stream().map(SearchResultIdCalculator::calculateSearchResultId).collect(Collectors.toList())); for (SearchResultItem item : searchResultItems) { long guid = SearchResultIdCalculator.calculateSearchResultId(item); if (!alreadySavedIds.contains(guid)) { SearchResultEntity searchResultEntity = new SearchResultEntity(); searchResultEntity.setIndexer(indexer); searchResultEntity.setTitle(item.getTitle()); searchResultEntity.setLink(item.getLink()); searchResultEntity.setDetails(item.getDetails()); searchResultEntity.setIndexerGuid(item.getIndexerGuid()); searchResultEntity.setFirstFound(Instant.now()); searchResultEntity.setDownloadType(item.getDownloadType()); searchResultEntity.setPubDate(item.getPubDate()); searchResultEntities.add(searchResultEntity); } item.setGuid(guid); item.setSearchResultId(guid); } debug("Found {} results which were already in the database and {} new ones", alreadySavedIds.size(), searchResultEntities.size()); try { searchResultRepository.saveAll(searchResultEntities); indexerSearchResult.setSearchResultEntities(new HashSet<>(searchResultEntities)); } catch (EntityExistsException e) { error("Unable to save the search results to the database", e); } } getLogger().debug(LoggingMarkers.PERFORMANCE, "Persisting {} search results took {}ms", searchResultItems.size(), stopwatch.elapsed(TimeUnit.MILLISECONDS)); return searchResultItems; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } |
@Test public void handleSuccess() throws Exception { indexerConfig.setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); indexerConfig.setDisabledLevel(1); indexerConfig.setDisabledUntil(Instant.now().toEpochMilli()); testee.handleSuccess(IndexerApiAccessType.SEARCH, 0L); assertThat(indexerConfig.getState(), is(IndexerConfig.State.ENABLED)); assertThat(indexerConfig.getDisabledLevel(), is(0)); assertThat(indexerConfig.getDisabledUntil(), is(nullValue())); } | protected void handleSuccess(IndexerApiAccessType accessType, Long responseTime) { if (getConfig().getDisabledLevel() > 0) { debug("Indexer was successfully called after {} failed attempts in a row", getConfig().getDisabledLevel()); } getConfig().setState(IndexerConfig.State.ENABLED); getConfig().setLastError(null); getConfig().setDisabledUntil(null); getConfig().setDisabledLevel(0); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, IndexerAccessResult.SUCCESSFUL, true); } | Indexer { protected void handleSuccess(IndexerApiAccessType accessType, Long responseTime) { if (getConfig().getDisabledLevel() > 0) { debug("Indexer was successfully called after {} failed attempts in a row", getConfig().getDisabledLevel()); } getConfig().setState(IndexerConfig.State.ENABLED); getConfig().setLastError(null); getConfig().setDisabledUntil(null); getConfig().setDisabledLevel(0); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, IndexerAccessResult.SUCCESSFUL, true); } } | Indexer { protected void handleSuccess(IndexerApiAccessType accessType, Long responseTime) { if (getConfig().getDisabledLevel() > 0) { debug("Indexer was successfully called after {} failed attempts in a row", getConfig().getDisabledLevel()); } getConfig().setState(IndexerConfig.State.ENABLED); getConfig().setLastError(null); getConfig().setDisabledUntil(null); getConfig().setDisabledLevel(0); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, IndexerAccessResult.SUCCESSFUL, true); } } | Indexer { protected void handleSuccess(IndexerApiAccessType accessType, Long responseTime) { if (getConfig().getDisabledLevel() > 0) { debug("Indexer was successfully called after {} failed attempts in a row", getConfig().getDisabledLevel()); } getConfig().setState(IndexerConfig.State.ENABLED); getConfig().setLastError(null); getConfig().setDisabledUntil(null); getConfig().setDisabledLevel(0); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, IndexerAccessResult.SUCCESSFUL, true); } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | Indexer { protected void handleSuccess(IndexerApiAccessType accessType, Long responseTime) { if (getConfig().getDisabledLevel() > 0) { debug("Indexer was successfully called after {} failed attempts in a row", getConfig().getDisabledLevel()); } getConfig().setState(IndexerConfig.State.ENABLED); getConfig().setLastError(null); getConfig().setDisabledUntil(null); getConfig().setDisabledLevel(0); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, IndexerAccessResult.SUCCESSFUL, true); } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } |
@Test public void handleFailure() throws Exception { indexerConfig.setState(IndexerConfig.State.ENABLED); indexerConfig.setDisabledLevel(0); indexerConfig.setDisabledUntil(null); testee.handleFailure("reason", false, null, null, null); assertThat(indexerConfig.getState(), is(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY)); assertThat(indexerConfig.getDisabledLevel(), is(1)); long disabledPeriod = Math.abs(Instant.ofEpochMilli(indexerConfig.getDisabledUntil()).getEpochSecond() - Instant.now().getEpochSecond()); long delta = Math.abs(Indexer.DISABLE_PERIODS.get(1) * 60 - disabledPeriod); org.assertj.core.api.Assertions.assertThat(delta).isLessThan(5); indexerConfig.setState(IndexerConfig.State.ENABLED); indexerConfig.setDisabledLevel(0); indexerConfig.setDisabledUntil(null); testee.handleFailure("reason", true, null, null, null); assertThat(indexerConfig.getState(), is(IndexerConfig.State.DISABLED_SYSTEM)); } | protected void handleFailure(String reason, Boolean disablePermanently, IndexerApiAccessType accessType, Long responseTime, IndexerAccessResult accessResult) { if (disablePermanently) { getLogger().warn("Because an unrecoverable error occurred {} will be permanently disabled until reenabled by the user", indexer.getName()); getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM); } else if (!configProvider.getBaseConfig().getSearching().isIgnoreTemporarilyDisabled()) { getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); getConfig().setDisabledLevel(getConfig().getDisabledLevel() + 1); long minutesToAdd = DISABLE_PERIODS.get(Math.min(DISABLE_PERIODS.size() - 1, getConfig().getDisabledLevel())); Instant disabledUntil = Instant.now().plus(minutesToAdd, ChronoUnit.MINUTES); getConfig().setDisabledUntil(disabledUntil.toEpochMilli()); getLogger().warn("Because an error occurred {} will be temporarily disabled until {}. This is error number {} in a row", indexer.getName(), disabledUntil, getConfig().getDisabledLevel()); } getConfig().setLastError(reason); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, accessResult, false); } | Indexer { protected void handleFailure(String reason, Boolean disablePermanently, IndexerApiAccessType accessType, Long responseTime, IndexerAccessResult accessResult) { if (disablePermanently) { getLogger().warn("Because an unrecoverable error occurred {} will be permanently disabled until reenabled by the user", indexer.getName()); getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM); } else if (!configProvider.getBaseConfig().getSearching().isIgnoreTemporarilyDisabled()) { getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); getConfig().setDisabledLevel(getConfig().getDisabledLevel() + 1); long minutesToAdd = DISABLE_PERIODS.get(Math.min(DISABLE_PERIODS.size() - 1, getConfig().getDisabledLevel())); Instant disabledUntil = Instant.now().plus(minutesToAdd, ChronoUnit.MINUTES); getConfig().setDisabledUntil(disabledUntil.toEpochMilli()); getLogger().warn("Because an error occurred {} will be temporarily disabled until {}. This is error number {} in a row", indexer.getName(), disabledUntil, getConfig().getDisabledLevel()); } getConfig().setLastError(reason); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, accessResult, false); } } | Indexer { protected void handleFailure(String reason, Boolean disablePermanently, IndexerApiAccessType accessType, Long responseTime, IndexerAccessResult accessResult) { if (disablePermanently) { getLogger().warn("Because an unrecoverable error occurred {} will be permanently disabled until reenabled by the user", indexer.getName()); getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM); } else if (!configProvider.getBaseConfig().getSearching().isIgnoreTemporarilyDisabled()) { getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); getConfig().setDisabledLevel(getConfig().getDisabledLevel() + 1); long minutesToAdd = DISABLE_PERIODS.get(Math.min(DISABLE_PERIODS.size() - 1, getConfig().getDisabledLevel())); Instant disabledUntil = Instant.now().plus(minutesToAdd, ChronoUnit.MINUTES); getConfig().setDisabledUntil(disabledUntil.toEpochMilli()); getLogger().warn("Because an error occurred {} will be temporarily disabled until {}. This is error number {} in a row", indexer.getName(), disabledUntil, getConfig().getDisabledLevel()); } getConfig().setLastError(reason); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, accessResult, false); } } | Indexer { protected void handleFailure(String reason, Boolean disablePermanently, IndexerApiAccessType accessType, Long responseTime, IndexerAccessResult accessResult) { if (disablePermanently) { getLogger().warn("Because an unrecoverable error occurred {} will be permanently disabled until reenabled by the user", indexer.getName()); getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM); } else if (!configProvider.getBaseConfig().getSearching().isIgnoreTemporarilyDisabled()) { getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); getConfig().setDisabledLevel(getConfig().getDisabledLevel() + 1); long minutesToAdd = DISABLE_PERIODS.get(Math.min(DISABLE_PERIODS.size() - 1, getConfig().getDisabledLevel())); Instant disabledUntil = Instant.now().plus(minutesToAdd, ChronoUnit.MINUTES); getConfig().setDisabledUntil(disabledUntil.toEpochMilli()); getLogger().warn("Because an error occurred {} will be temporarily disabled until {}. This is error number {} in a row", indexer.getName(), disabledUntil, getConfig().getDisabledLevel()); } getConfig().setLastError(reason); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, accessResult, false); } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | Indexer { protected void handleFailure(String reason, Boolean disablePermanently, IndexerApiAccessType accessType, Long responseTime, IndexerAccessResult accessResult) { if (disablePermanently) { getLogger().warn("Because an unrecoverable error occurred {} will be permanently disabled until reenabled by the user", indexer.getName()); getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM); } else if (!configProvider.getBaseConfig().getSearching().isIgnoreTemporarilyDisabled()) { getConfig().setState(IndexerConfig.State.DISABLED_SYSTEM_TEMPORARY); getConfig().setDisabledLevel(getConfig().getDisabledLevel() + 1); long minutesToAdd = DISABLE_PERIODS.get(Math.min(DISABLE_PERIODS.size() - 1, getConfig().getDisabledLevel())); Instant disabledUntil = Instant.now().plus(minutesToAdd, ChronoUnit.MINUTES); getConfig().setDisabledUntil(disabledUntil.toEpochMilli()); getLogger().warn("Because an error occurred {} will be temporarily disabled until {}. This is error number {} in a row", indexer.getName(), disabledUntil, getConfig().getDisabledLevel()); } getConfig().setLastError(reason); configProvider.getBaseConfig().save(false); saveApiAccess(accessType, responseTime, accessResult, false); } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } |
@Test public void shouldRemoveTrailing2() { List<String> collect = IntStream.range(1, 100).mapToObj(x -> "trailing" + x + "*********").collect(Collectors.toList()); List<String> all = new ArrayList<>(); all.addAll(collect); all.add("trailing*"); baseConfig.getSearching().setRemoveTrailing(all); testee.cleanUpTitle("abc trailing1 trailing2"); testee.cleanUpTitle("abc trailing1 trailing2"); testee.cleanUpTitle("abc trailing1 trailing2"); Stopwatch stopwatch = Stopwatch.createStarted(); for (int i = 0; i < 100; i++) { testee.cleanUpTitle("abc trailing1 trailing2"); } System.out.println(stopwatch.elapsed(TimeUnit.MILLISECONDS)); } | public String cleanUpTitle(String title) { if (Strings.isNullOrEmpty(title)) { return title; } title = title.trim(); List<String> removeTrailing = configProvider.getBaseConfig().getSearching().getRemoveTrailing().stream().map(x -> x.toLowerCase().trim()).collect(Collectors.toList()); if (removeTrailing.isEmpty()) { return title; } if (cleanupPattern == null) { String allPattern = "^(?<keep>.*)(" + removeTrailing.stream().map(x -> x.replace("*", "WILDCARDXXX").replaceAll("[-\\[\\]{}()*+?.,\\\\\\\\^$|#]", "\\\\$0").replace("WILDCARDXXX", ".*") + "$").collect(Collectors.joining("|")) + ")"; cleanupPattern = Pattern.compile(allPattern, Pattern.CASE_INSENSITIVE); } Matcher matcher = cleanupPattern.matcher(title); while (matcher.matches()) { title = matcher.replaceAll("$1").trim(); matcher = cleanupPattern.matcher(title); } return title; } | Indexer { public String cleanUpTitle(String title) { if (Strings.isNullOrEmpty(title)) { return title; } title = title.trim(); List<String> removeTrailing = configProvider.getBaseConfig().getSearching().getRemoveTrailing().stream().map(x -> x.toLowerCase().trim()).collect(Collectors.toList()); if (removeTrailing.isEmpty()) { return title; } if (cleanupPattern == null) { String allPattern = "^(?<keep>.*)(" + removeTrailing.stream().map(x -> x.replace("*", "WILDCARDXXX").replaceAll("[-\\[\\]{}()*+?.,\\\\\\\\^$|#]", "\\\\$0").replace("WILDCARDXXX", ".*") + "$").collect(Collectors.joining("|")) + ")"; cleanupPattern = Pattern.compile(allPattern, Pattern.CASE_INSENSITIVE); } Matcher matcher = cleanupPattern.matcher(title); while (matcher.matches()) { title = matcher.replaceAll("$1").trim(); matcher = cleanupPattern.matcher(title); } return title; } } | Indexer { public String cleanUpTitle(String title) { if (Strings.isNullOrEmpty(title)) { return title; } title = title.trim(); List<String> removeTrailing = configProvider.getBaseConfig().getSearching().getRemoveTrailing().stream().map(x -> x.toLowerCase().trim()).collect(Collectors.toList()); if (removeTrailing.isEmpty()) { return title; } if (cleanupPattern == null) { String allPattern = "^(?<keep>.*)(" + removeTrailing.stream().map(x -> x.replace("*", "WILDCARDXXX").replaceAll("[-\\[\\]{}()*+?.,\\\\\\\\^$|#]", "\\\\$0").replace("WILDCARDXXX", ".*") + "$").collect(Collectors.joining("|")) + ")"; cleanupPattern = Pattern.compile(allPattern, Pattern.CASE_INSENSITIVE); } Matcher matcher = cleanupPattern.matcher(title); while (matcher.matches()) { title = matcher.replaceAll("$1").trim(); matcher = cleanupPattern.matcher(title); } return title; } } | Indexer { public String cleanUpTitle(String title) { if (Strings.isNullOrEmpty(title)) { return title; } title = title.trim(); List<String> removeTrailing = configProvider.getBaseConfig().getSearching().getRemoveTrailing().stream().map(x -> x.toLowerCase().trim()).collect(Collectors.toList()); if (removeTrailing.isEmpty()) { return title; } if (cleanupPattern == null) { String allPattern = "^(?<keep>.*)(" + removeTrailing.stream().map(x -> x.replace("*", "WILDCARDXXX").replaceAll("[-\\[\\]{}()*+?.,\\\\\\\\^$|#]", "\\\\$0").replace("WILDCARDXXX", ".*") + "$").collect(Collectors.joining("|")) + ")"; cleanupPattern = Pattern.compile(allPattern, Pattern.CASE_INSENSITIVE); } Matcher matcher = cleanupPattern.matcher(title); while (matcher.matches()) { title = matcher.replaceAll("$1").trim(); matcher = cleanupPattern.matcher(title); } return title; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | Indexer { public String cleanUpTitle(String title) { if (Strings.isNullOrEmpty(title)) { return title; } title = title.trim(); List<String> removeTrailing = configProvider.getBaseConfig().getSearching().getRemoveTrailing().stream().map(x -> x.toLowerCase().trim()).collect(Collectors.toList()); if (removeTrailing.isEmpty()) { return title; } if (cleanupPattern == null) { String allPattern = "^(?<keep>.*)(" + removeTrailing.stream().map(x -> x.replace("*", "WILDCARDXXX").replaceAll("[-\\[\\]{}()*+?.,\\\\\\\\^$|#]", "\\\\$0").replace("WILDCARDXXX", ".*") + "$").collect(Collectors.joining("|")) + ")"; cleanupPattern = Pattern.compile(allPattern, Pattern.CASE_INSENSITIVE); } Matcher matcher = cleanupPattern.matcher(title); while (matcher.matches()) { title = matcher.replaceAll("$1").trim(); matcher = cleanupPattern.matcher(title); } return title; } void initialize(IndexerConfig config, IndexerEntity indexer); @EventListener void handleNewConfig(ConfigChangedEvent configChangedEvent); IndexerSearchResult search(SearchRequest searchRequest, int offset, Integer limit); abstract NfoResult getNfo(String guid); String getName(); IndexerConfig getConfig(); IndexerEntity getIndexerEntity(); String cleanUpTitle(String title); Optional<Instant> tryParseDate(String dateString); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } |
@Test public void shouldCreateSearchResultItem() throws Exception { NewznabXmlItem rssItem = buildBasicRssItem(); rssItem.setSize(456L); rssItem.getTorznabAttributes().add(new NewznabAttribute("password", "0")); rssItem.getTorznabAttributes().add(new NewznabAttribute("group", "group")); rssItem.getTorznabAttributes().add(new NewznabAttribute("poster", "poster")); rssItem.getTorznabAttributes().add(new NewznabAttribute("size", "456")); rssItem.getTorznabAttributes().add(new NewznabAttribute("files", "10")); rssItem.getTorznabAttributes().add(new NewznabAttribute("grabs", "20")); rssItem.getTorznabAttributes().add(new NewznabAttribute("comments", "30")); rssItem.getTorznabAttributes().add(new NewznabAttribute("usenetdate", new JaxbPubdateAdapter().marshal(Instant.ofEpochSecond(6666666)))); rssItem.getEnclosures().add(new NewznabXmlEnclosure("http: rssItem.setCategory("4000"); SearchResultItem item = testee.createSearchResultItem(rssItem); assertThat(item.getLink(), is("http: assertThat(item.getIndexerGuid(), is("http: assertThat(item.getSize(), is(456L)); assertThat(item.getCommentsLink(), is("http: assertThat(item.getDetails(), is("http: assertThat(item.isAgePrecise(), is(true)); assertThat(item.getGrabs(), is(20)); assertThat(item.getDownloadType(), is(DownloadType.TORRENT)); } | protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } |
@Test public void shouldComputeCategory() throws Exception { when(categoryProviderMock.fromResultNewznabCategories(ArgumentMatchers.any())).thenReturn(categoryMock); NewznabXmlItem rssItem = buildBasicRssItem(); rssItem.getTorznabAttributes().add(new NewznabAttribute("category", "5070")); rssItem.getEnclosures().add(new NewznabXmlEnclosure("url", 1L, "application/x-bittorrent")); SearchResultItem item = testee.createSearchResultItem(rssItem); assertThat(item.getCategory(), is(categoryMock)); rssItem.getTorznabAttributes().clear(); rssItem.setCategory("5070"); item = testee.createSearchResultItem(rssItem); assertThat(item.getCategory(), is(categoryMock)); } | protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } | Torznab extends Newznab { protected SearchResultItem createSearchResultItem(NewznabXmlItem item) throws NzbHydraException { item.getRssGuid().setPermaLink(true); SearchResultItem searchResultItem = super.createSearchResultItem(item); searchResultItem.setGrabs(item.getGrabs()); searchResultItem.setIndexerGuid(item.getRssGuid().getGuid()); for (NewznabAttribute attribute : item.getTorznabAttributes()) { searchResultItem.getAttributes().put(attribute.getName(), attribute.getValue()); switch (attribute.getName()) { case "grabs": searchResultItem.setGrabs(Integer.valueOf(attribute.getValue())); break; case "guid": searchResultItem.setIndexerGuid(attribute.getValue()); break; case "seeders": searchResultItem.setSeeders(Integer.valueOf(attribute.getValue())); break; case "peers": searchResultItem.setPeers(Integer.valueOf(attribute.getValue())); break; } } if (item.getSize() != null) { searchResultItem.setSize(item.getSize()); } else if (item.getTorznabAttributes().stream().noneMatch(x -> x.getName().equals("size"))) { searchResultItem.getAttributes().put("size", String.valueOf(item.getSize())); } List<Integer> foundCategories = tryAndGetCategoryAsNumber(item); if (!foundCategories.isEmpty()) { computeCategory(searchResultItem, foundCategories); } else { searchResultItem.setCategory(categoryProvider.getNotAvailable()); } searchResultItem.setHasNfo(HasNfo.NO); searchResultItem.setIndexerScore(config.getScore()); searchResultItem.setDownloadType(DownloadType.TORRENT); searchResultItem.setGuid(SearchResultIdCalculator.calculateSearchResultId(searchResultItem)); return searchResultItem; } } |
@Test public void shouldNotAddExcludedWordsToQuery() throws Exception { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getInternalData().setForbiddenWords(Arrays.asList("notthis", "alsonotthis")); searchRequest.setQuery("query"); UriComponentsBuilder builder = testee.buildSearchUrl(searchRequest, 0, 100); assertThat(builder.toUriString(), not(containsString("notthis"))); } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { return super.buildSearchUrl(searchRequest, null, null); } | Torznab extends Newznab { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { return super.buildSearchUrl(searchRequest, null, null); } } | Torznab extends Newznab { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { return super.buildSearchUrl(searchRequest, null, null); } } | Torznab extends Newznab { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { return super.buildSearchUrl(searchRequest, null, null); } } | Torznab extends Newznab { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { return super.buildSearchUrl(searchRequest, null, null); } } |
@Test public void shouldGetCorrectCategoryNumber() { NewznabXmlItem item = buildBasicRssItem(); item.setTorznabAttributes(Collections.singletonList(new NewznabAttribute("category", "2000"))); List<Integer> integers = testee.tryAndGetCategoryAsNumber(item); assertThat(integers.size(), is(1)); assertThat(integers.get(0), is(2000)); item.setTorznabAttributes(Collections.singletonList(new NewznabAttribute("category", "10000"))); integers = testee.tryAndGetCategoryAsNumber(item); assertThat(integers.size(), is(1)); assertThat(integers.get(0), is(10000)); item.setTorznabAttributes(Arrays.asList(new NewznabAttribute("category", "2000"), new NewznabAttribute("category", "10000"))); integers = testee.tryAndGetCategoryAsNumber(item); integers.sort(Comparator.naturalOrder()); assertThat(integers.size(), is(2)); assertThat(integers.get(0), is(2000)); assertThat(integers.get(1), is(10000)); item.setTorznabAttributes(Arrays.asList(new NewznabAttribute("category", "2000"), new NewznabAttribute("category", "2040"))); integers = testee.tryAndGetCategoryAsNumber(item); integers.sort(Comparator.naturalOrder()); assertThat(integers.size(), is(2)); assertThat(integers.get(0), is(2000)); assertThat(integers.get(1), is(2040)); item.setTorznabAttributes(Arrays.asList(new NewznabAttribute("category", "2000"), new NewznabAttribute("category", "2040"), new NewznabAttribute("category", "10000"))); integers = testee.tryAndGetCategoryAsNumber(item); integers.sort(Comparator.naturalOrder()); assertThat(integers.size(), is(3)); assertThat(integers.get(0), is(2000)); assertThat(integers.get(1), is(2040)); } | protected List<Integer> tryAndGetCategoryAsNumber(NewznabXmlItem item) { Set<Integer> foundCategories = new HashSet<>(); if (item.getCategory() != null) { try { foundCategories.add(Integer.parseInt(item.getCategory())); } catch (NumberFormatException e) { } } foundCategories.addAll(item.getNewznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); foundCategories.addAll(item.getTorznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); return new ArrayList<>(foundCategories); } | Torznab extends Newznab { protected List<Integer> tryAndGetCategoryAsNumber(NewznabXmlItem item) { Set<Integer> foundCategories = new HashSet<>(); if (item.getCategory() != null) { try { foundCategories.add(Integer.parseInt(item.getCategory())); } catch (NumberFormatException e) { } } foundCategories.addAll(item.getNewznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); foundCategories.addAll(item.getTorznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); return new ArrayList<>(foundCategories); } } | Torznab extends Newznab { protected List<Integer> tryAndGetCategoryAsNumber(NewznabXmlItem item) { Set<Integer> foundCategories = new HashSet<>(); if (item.getCategory() != null) { try { foundCategories.add(Integer.parseInt(item.getCategory())); } catch (NumberFormatException e) { } } foundCategories.addAll(item.getNewznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); foundCategories.addAll(item.getTorznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); return new ArrayList<>(foundCategories); } } | Torznab extends Newznab { protected List<Integer> tryAndGetCategoryAsNumber(NewznabXmlItem item) { Set<Integer> foundCategories = new HashSet<>(); if (item.getCategory() != null) { try { foundCategories.add(Integer.parseInt(item.getCategory())); } catch (NumberFormatException e) { } } foundCategories.addAll(item.getNewznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); foundCategories.addAll(item.getTorznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); return new ArrayList<>(foundCategories); } } | Torznab extends Newznab { protected List<Integer> tryAndGetCategoryAsNumber(NewznabXmlItem item) { Set<Integer> foundCategories = new HashSet<>(); if (item.getCategory() != null) { try { foundCategories.add(Integer.parseInt(item.getCategory())); } catch (NumberFormatException e) { } } foundCategories.addAll(item.getNewznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); foundCategories.addAll(item.getTorznabAttributes().stream().filter(x -> x.getName().equals("category")).map(x -> Integer.valueOf(x.getValue())).collect(Collectors.toList())); return new ArrayList<>(foundCategories); } } |
@Test public void shouldCheckContext() { when(searchModuleProviderMock.getIndexers()).thenReturn(Arrays.asList(indexer)); when(searchRequest.getSource()).thenReturn(SearchSource.INTERNAL); indexerConfigMock.setEnabledForSearchSource(SearchSourceRestriction.API); assertFalse(testee.checkSearchSource(indexer)); when(searchRequest.getSource()).thenReturn(SearchSource.API); assertTrue(testee.checkSearchSource(indexer)); } | protected boolean checkSearchSource(Indexer indexer) { boolean wrongSearchSource = !indexer.getConfig().getEnabledForSearchSource().meets(searchRequest); if (wrongSearchSource) { String message = String.format("Not using %s because the search source is %s but the indexer is only enabled for %s searches", indexer.getName(), searchRequest.getSource(), indexer.getConfig().getEnabledForSearchSource()); return handleIndexerNotSelected(indexer, message, "Not enabled for this search context"); } return true; } | IndexerForSearchSelector { protected boolean checkSearchSource(Indexer indexer) { boolean wrongSearchSource = !indexer.getConfig().getEnabledForSearchSource().meets(searchRequest); if (wrongSearchSource) { String message = String.format("Not using %s because the search source is %s but the indexer is only enabled for %s searches", indexer.getName(), searchRequest.getSource(), indexer.getConfig().getEnabledForSearchSource()); return handleIndexerNotSelected(indexer, message, "Not enabled for this search context"); } return true; } } | IndexerForSearchSelector { protected boolean checkSearchSource(Indexer indexer) { boolean wrongSearchSource = !indexer.getConfig().getEnabledForSearchSource().meets(searchRequest); if (wrongSearchSource) { String message = String.format("Not using %s because the search source is %s but the indexer is only enabled for %s searches", indexer.getName(), searchRequest.getSource(), indexer.getConfig().getEnabledForSearchSource()); return handleIndexerNotSelected(indexer, message, "Not enabled for this search context"); } return true; } } | IndexerForSearchSelector { protected boolean checkSearchSource(Indexer indexer) { boolean wrongSearchSource = !indexer.getConfig().getEnabledForSearchSource().meets(searchRequest); if (wrongSearchSource) { String message = String.format("Not using %s because the search source is %s but the indexer is only enabled for %s searches", indexer.getName(), searchRequest.getSource(), indexer.getConfig().getEnabledForSearchSource()); return handleIndexerNotSelected(indexer, message, "Not enabled for this search context"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkSearchSource(Indexer indexer) { boolean wrongSearchSource = !indexer.getConfig().getEnabledForSearchSource().meets(searchRequest); if (wrongSearchSource) { String message = String.format("Not using %s because the search source is %s but the indexer is only enabled for %s searches", indexer.getName(), searchRequest.getSource(), indexer.getConfig().getEnabledForSearchSource()); return handleIndexerNotSelected(indexer, message, "Not enabled for this search context"); } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldBuildSimpleQuery() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.setQuery("query"); UriComponentsBuilder builder = testee.buildSearchUrl(searchRequest, 0, 100); assertThat(builder.toUriString(), is("https: } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test public void shouldAddRequiredWords() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getInternalData().setRequiredWords(Arrays.asList("a", "b")); searchRequest.setQuery("query"); UriComponentsBuilder builder = testee.buildSearchUrl(searchRequest, 0, 100); assertThat(builder.toUriString(), is("https: } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerSearchAbortedException.class) public void shouldAbortIfSearchNotPossible() throws IndexerSearchAbortedException { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); testee.buildSearchUrl(searchRequest, 0, 100); } | @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } | Anizb extends Indexer<NewznabXmlRoot> { @Override protected UriComponentsBuilder buildSearchUrl(SearchRequest searchRequest, Integer offset, Integer limit) throws IndexerSearchAbortedException { String query = super.generateQueryIfApplicable(searchRequest, ""); query = addRequiredWordsToQuery(searchRequest, query); if (Strings.isNullOrEmpty(query)) { throw new IndexerSearchAbortedException("Anizb cannot search without a query"); } query = cleanupQuery(query); return UriComponentsBuilder.fromHttpUrl("https: } @Override NfoResult getNfo(String guid); } |
@Test public void shouldLimitQueryLengthWhenAddingForbiddenWords() throws Exception { SearchRequest request = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); request.getInternalData().setForbiddenWords(Arrays.asList("characters50sssssssssssssssssssssssssssssssssssss1", "characters50sssssssssssssssssssssssssssssssssssss2", "characters50sssssssssssssssssssssssssssssssssssss3", "characters50sssssssssssssssssssssssssssssssssssss4", "characters40ssssssssssssssssssssssssssss", "aaaaa", "bbbbb")); String query = testee.addForbiddenWords(request, ""); assertThat(query.length()).isLessThan(255); } | protected String addForbiddenWords(SearchRequest searchRequest, String query) { List<String> allForbiddenWords = new ArrayList<>(searchRequest.getInternalData().getForbiddenWords()); allForbiddenWords.addAll(configProvider.getBaseConfig().getSearching().getForbiddenWords()); allForbiddenWords.addAll(searchRequest.getCategory().getForbiddenWords()); List<String> allPossibleForbiddenWords = allForbiddenWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allForbiddenWords.size() > allPossibleForbiddenWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } if (!allPossibleForbiddenWords.isEmpty()) { StringBuilder queryBuilder = new StringBuilder(query); for (String word : allForbiddenWords) { if ((queryBuilder + " --" + word).length() < 255) { queryBuilder.append(" --").append(word); } } query = queryBuilder.toString(); } return query; } | NzbsOrg extends Newznab { protected String addForbiddenWords(SearchRequest searchRequest, String query) { List<String> allForbiddenWords = new ArrayList<>(searchRequest.getInternalData().getForbiddenWords()); allForbiddenWords.addAll(configProvider.getBaseConfig().getSearching().getForbiddenWords()); allForbiddenWords.addAll(searchRequest.getCategory().getForbiddenWords()); List<String> allPossibleForbiddenWords = allForbiddenWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allForbiddenWords.size() > allPossibleForbiddenWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } if (!allPossibleForbiddenWords.isEmpty()) { StringBuilder queryBuilder = new StringBuilder(query); for (String word : allForbiddenWords) { if ((queryBuilder + " --" + word).length() < 255) { queryBuilder.append(" --").append(word); } } query = queryBuilder.toString(); } return query; } } | NzbsOrg extends Newznab { protected String addForbiddenWords(SearchRequest searchRequest, String query) { List<String> allForbiddenWords = new ArrayList<>(searchRequest.getInternalData().getForbiddenWords()); allForbiddenWords.addAll(configProvider.getBaseConfig().getSearching().getForbiddenWords()); allForbiddenWords.addAll(searchRequest.getCategory().getForbiddenWords()); List<String> allPossibleForbiddenWords = allForbiddenWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allForbiddenWords.size() > allPossibleForbiddenWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } if (!allPossibleForbiddenWords.isEmpty()) { StringBuilder queryBuilder = new StringBuilder(query); for (String word : allForbiddenWords) { if ((queryBuilder + " --" + word).length() < 255) { queryBuilder.append(" --").append(word); } } query = queryBuilder.toString(); } return query; } } | NzbsOrg extends Newznab { protected String addForbiddenWords(SearchRequest searchRequest, String query) { List<String> allForbiddenWords = new ArrayList<>(searchRequest.getInternalData().getForbiddenWords()); allForbiddenWords.addAll(configProvider.getBaseConfig().getSearching().getForbiddenWords()); allForbiddenWords.addAll(searchRequest.getCategory().getForbiddenWords()); List<String> allPossibleForbiddenWords = allForbiddenWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allForbiddenWords.size() > allPossibleForbiddenWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } if (!allPossibleForbiddenWords.isEmpty()) { StringBuilder queryBuilder = new StringBuilder(query); for (String word : allForbiddenWords) { if ((queryBuilder + " --" + word).length() < 255) { queryBuilder.append(" --").append(word); } } query = queryBuilder.toString(); } return query; } } | NzbsOrg extends Newznab { protected String addForbiddenWords(SearchRequest searchRequest, String query) { List<String> allForbiddenWords = new ArrayList<>(searchRequest.getInternalData().getForbiddenWords()); allForbiddenWords.addAll(configProvider.getBaseConfig().getSearching().getForbiddenWords()); allForbiddenWords.addAll(searchRequest.getCategory().getForbiddenWords()); List<String> allPossibleForbiddenWords = allForbiddenWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allForbiddenWords.size() > allPossibleForbiddenWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } if (!allPossibleForbiddenWords.isEmpty()) { StringBuilder queryBuilder = new StringBuilder(query); for (String word : allForbiddenWords) { if ((queryBuilder + " --" + word).length() < 255) { queryBuilder.append(" --").append(word); } } query = queryBuilder.toString(); } return query; } } |
@Test public void shouldLimitQueryLengthWhenAddingRequiredWords() throws Exception { SearchRequest request = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); request.getInternalData().setRequiredWords(Arrays.asList("characters50sssssssssssssssssssssssssssssssssssss1", "characters50sssssssssssssssssssssssssssssssssssss2", "characters50sssssssssssssssssssssssssssssssssssss3", "characters50sssssssssssssssssssssssssssssssssssss4", "characters40ssssssssssssssssssssssssssss", "aaaaa", "bbbbb")); String query = testee.addRequiredWords(request, ""); assertThat(query.length()).isLessThan(255); } | protected String addRequiredWords(SearchRequest searchRequest, String query) { List<String> allRequiredWords = new ArrayList<>(searchRequest.getInternalData().getRequiredWords()); allRequiredWords.addAll(configProvider.getBaseConfig().getSearching().getRequiredWords()); allRequiredWords.addAll(searchRequest.getCategory().getRequiredWords()); List<String> allPossibleRequiredWords = allRequiredWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allRequiredWords.size() > allPossibleRequiredWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } StringBuilder queryBuilder = new StringBuilder(query); for (String word : allPossibleRequiredWords) { if ((queryBuilder + word).length() < 255) { queryBuilder.append(" ").append(queryBuilder); } } query = queryBuilder.toString(); return query; } | NzbsOrg extends Newznab { protected String addRequiredWords(SearchRequest searchRequest, String query) { List<String> allRequiredWords = new ArrayList<>(searchRequest.getInternalData().getRequiredWords()); allRequiredWords.addAll(configProvider.getBaseConfig().getSearching().getRequiredWords()); allRequiredWords.addAll(searchRequest.getCategory().getRequiredWords()); List<String> allPossibleRequiredWords = allRequiredWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allRequiredWords.size() > allPossibleRequiredWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } StringBuilder queryBuilder = new StringBuilder(query); for (String word : allPossibleRequiredWords) { if ((queryBuilder + word).length() < 255) { queryBuilder.append(" ").append(queryBuilder); } } query = queryBuilder.toString(); return query; } } | NzbsOrg extends Newznab { protected String addRequiredWords(SearchRequest searchRequest, String query) { List<String> allRequiredWords = new ArrayList<>(searchRequest.getInternalData().getRequiredWords()); allRequiredWords.addAll(configProvider.getBaseConfig().getSearching().getRequiredWords()); allRequiredWords.addAll(searchRequest.getCategory().getRequiredWords()); List<String> allPossibleRequiredWords = allRequiredWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allRequiredWords.size() > allPossibleRequiredWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } StringBuilder queryBuilder = new StringBuilder(query); for (String word : allPossibleRequiredWords) { if ((queryBuilder + word).length() < 255) { queryBuilder.append(" ").append(queryBuilder); } } query = queryBuilder.toString(); return query; } } | NzbsOrg extends Newznab { protected String addRequiredWords(SearchRequest searchRequest, String query) { List<String> allRequiredWords = new ArrayList<>(searchRequest.getInternalData().getRequiredWords()); allRequiredWords.addAll(configProvider.getBaseConfig().getSearching().getRequiredWords()); allRequiredWords.addAll(searchRequest.getCategory().getRequiredWords()); List<String> allPossibleRequiredWords = allRequiredWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allRequiredWords.size() > allPossibleRequiredWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } StringBuilder queryBuilder = new StringBuilder(query); for (String word : allPossibleRequiredWords) { if ((queryBuilder + word).length() < 255) { queryBuilder.append(" ").append(queryBuilder); } } query = queryBuilder.toString(); return query; } } | NzbsOrg extends Newznab { protected String addRequiredWords(SearchRequest searchRequest, String query) { List<String> allRequiredWords = new ArrayList<>(searchRequest.getInternalData().getRequiredWords()); allRequiredWords.addAll(configProvider.getBaseConfig().getSearching().getRequiredWords()); allRequiredWords.addAll(searchRequest.getCategory().getRequiredWords()); List<String> allPossibleRequiredWords = allRequiredWords.stream().filter(x -> !(x.contains(" ") || x.contains("-") || x.contains("."))).collect(Collectors.toList()); if (allRequiredWords.size() > allPossibleRequiredWords.size()) { logger.debug("Not using some forbidden words in query because characters forbidden by newznab are contained"); } StringBuilder queryBuilder = new StringBuilder(query); for (String word : allPossibleRequiredWords) { if ((queryBuilder + word).length() < 255) { queryBuilder.append(" ").append(queryBuilder); } } query = queryBuilder.toString(); return query; } } |
@Test public void shouldTruncateLongQuery() { StringBuilder longQuery = new StringBuilder(); for (int i = 0; i < 56; i++) { longQuery.append(" " + "characters15sss"); }assertThat(longQuery.length()).isGreaterThan(255); String query = testee.cleanupQuery(longQuery.toString()); assertThat(query.length()).isLessThan(255); } | @Override protected String cleanupQuery(String query) { query = super.cleanupQuery(query); if (query.length() > 255) { logger.warn("Truncating query because its length is {} but only 255 characters are supported", query.length()); StringBuilder shorterQuery = new StringBuilder(); for (String s : query.split(" ")) { if ((shorterQuery + s).length() < 255) { shorterQuery.append(" ").append(s); } else { break; } } query = shorterQuery.toString(); } return query; } | NzbsOrg extends Newznab { @Override protected String cleanupQuery(String query) { query = super.cleanupQuery(query); if (query.length() > 255) { logger.warn("Truncating query because its length is {} but only 255 characters are supported", query.length()); StringBuilder shorterQuery = new StringBuilder(); for (String s : query.split(" ")) { if ((shorterQuery + s).length() < 255) { shorterQuery.append(" ").append(s); } else { break; } } query = shorterQuery.toString(); } return query; } } | NzbsOrg extends Newznab { @Override protected String cleanupQuery(String query) { query = super.cleanupQuery(query); if (query.length() > 255) { logger.warn("Truncating query because its length is {} but only 255 characters are supported", query.length()); StringBuilder shorterQuery = new StringBuilder(); for (String s : query.split(" ")) { if ((shorterQuery + s).length() < 255) { shorterQuery.append(" ").append(s); } else { break; } } query = shorterQuery.toString(); } return query; } } | NzbsOrg extends Newznab { @Override protected String cleanupQuery(String query) { query = super.cleanupQuery(query); if (query.length() > 255) { logger.warn("Truncating query because its length is {} but only 255 characters are supported", query.length()); StringBuilder shorterQuery = new StringBuilder(); for (String s : query.split(" ")) { if ((shorterQuery + s).length() < 255) { shorterQuery.append(" ").append(s); } else { break; } } query = shorterQuery.toString(); } return query; } } | NzbsOrg extends Newznab { @Override protected String cleanupQuery(String query) { query = super.cleanupQuery(query); if (query.length() > 255) { logger.warn("Truncating query because its length is {} but only 255 characters are supported", query.length()); StringBuilder shorterQuery = new StringBuilder(); for (String s : query.split(" ")) { if ((shorterQuery + s).length() < 255) { shorterQuery.append(" ").append(s); } else { break; } } query = shorterQuery.toString(); } return query; } } |
@Test public void shouldReturnCorrectSearchResults() throws Exception { NewznabXmlRoot root = RssBuilder.builder().items(Arrays.asList(RssItemBuilder.builder("title").build())).newznabResponse(0, 1).build(); when(indexerWebAccessMock.get(any(), eq(testee.config), any())).thenReturn(root); IndexerSearchResult indexerSearchResult = testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); assertThat(indexerSearchResult.getSearchResultItems().size(), is(1)); assertThat(indexerSearchResult.getTotalResults(), is(1)); assertThat(indexerSearchResult.isHasMoreResults(), is(false)); assertThat(indexerSearchResult.isTotalResultsKnown(), is(true)); } | @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldAccountForRejectedResults() throws Exception { List<NewznabXmlItem> items = Arrays.asList( RssItemBuilder.builder("title1").build(), RssItemBuilder.builder("title2").build(), RssItemBuilder.builder("title3").build(), RssItemBuilder.builder("title4").build(), RssItemBuilder.builder("title5").build() ); NewznabXmlRoot root = RssBuilder.builder().items(items).newznabResponse(100, 105).build(); when(indexerWebAccessMock.get(any(), eq(testee.config), any())).thenReturn(root); when(resultAcceptorMock.acceptResults(any(), any(), any())).thenAnswer(new Answer<AcceptorResult>() { @Override public AcceptorResult answer(InvocationOnMock invocation) throws Throwable { List<SearchResultItem> argument = invocation.getArgument(0); HashMultiset<String> reasonsForRejection = HashMultiset.create(); reasonsForRejection.add("some reason", 2); return new AcceptorResult(argument.subList(0, 3), reasonsForRejection); } }); IndexerSearchResult indexerSearchResult = testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); assertThat(indexerSearchResult.getSearchResultItems().size(), is(3)); assertThat(indexerSearchResult.getTotalResults(), is(105)); assertThat(indexerSearchResult.isHasMoreResults(), is(false)); assertThat(indexerSearchResult.isTotalResultsKnown(), is(true)); } | @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { @Override protected List<SearchResultItem> getSearchResultItems(Xml rssRoot, SearchRequest searchRequest) { List<SearchResultItem> searchResultItems = new ArrayList<>(); final NewznabXmlRoot newznabXmlRoot = (NewznabXmlRoot) rssRoot; checkForTooManyResults(searchRequest, newznabXmlRoot); for (NewznabXmlItem item : newznabXmlRoot.getRssChannel().getItems()) { try { SearchResultItem searchResultItem = createSearchResultItem(item); searchResultItems.add(searchResultItem); } catch (NzbHydraException e) { } } return searchResultItems; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldGetIdsIfNoneOfTheProvidedAreSupported() throws Exception { when(infoProviderMock.canConvertAny(anySet(), anySet())).thenReturn(true); SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getIdentifiers().put(MediaIdType.IMDB, "imdbId"); searchRequest.getIdentifiers().put(MediaIdType.TVMAZE, "tvmazeId"); UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http: testee.config.getSupportedSearchIds().addAll(Arrays.asList(MediaIdType.TMDB, MediaIdType.TVRAGE, MediaIdType.TVMAZE)); builder = testee.extendQueryUrlWithSearchIds(searchRequest, builder); MultiValueMap<String, String> params = builder.build().getQueryParams(); assertFalse(params.containsKey("imdbid")); assertFalse(params.containsKey("tmdbid")); assertFalse(params.containsKey("rid")); assertTrue(params.containsKey("tvmazeid")); } | protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldNotGetInfosIfAtLeastOneProvidedIsSupported() throws Exception { testee.config = new IndexerConfig(); testee.config.setSupportedSearchIds(Lists.newArrayList(MediaIdType.IMDB)); SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getIdentifiers().put(MediaIdType.IMDB, "imdbId"); UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http: builder = testee.extendQueryUrlWithSearchIds(searchRequest, builder); MultiValueMap<String, String> params = builder.build().getQueryParams(); assertTrue(params.containsKey("imdbid")); assertEquals(1, params.size()); verify(infoProviderMock, never()).convert(anyString(), any(MediaIdType.class)); } | protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldCheckIdConversion() { Set<MediaIdType> supported = Sets.newSet(MediaIdType.TVMAZE, MediaIdType.TVDB); Set<MediaIdType> provided = Sets.newSet(MediaIdType.TVMAZE); when(searchRequest.getQuery()).thenReturn(Optional.empty()); when(infoProviderMock.canConvertAny(provided, supported)).thenReturn(true); assertTrue(testee.checkSearchId(indexer)); when(searchRequest.getQuery()).thenReturn(Optional.of("a query")); when(infoProviderMock.canConvertAny(provided, supported)).thenReturn(false); assertTrue(testee.checkSearchId(indexer)); provided = new HashSet<>(); when(searchRequest.getQuery()).thenReturn(Optional.empty()); verify(infoProviderMock, never()).canConvertAny(provided, supported); assertTrue(testee.checkSearchId(indexer)); } | protected boolean checkSearchId(Indexer indexer) { boolean needToSearchById = !searchRequest.getIdentifiers().isEmpty() && !searchRequest.getQuery().isPresent(); if (needToSearchById) { boolean canUseAnyProvidedId = !Collections.disjoint(searchRequest.getIdentifiers().keySet(), indexer.getConfig().getSupportedSearchIds()); boolean cannotSearchProvidedOrConvertableId = !canUseAnyProvidedId && !infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), Sets.newHashSet(indexer.getConfig().getSupportedSearchIds())); boolean queryGenerationEnabled = configProvider.getBaseConfig().getSearching().getGenerateQueries().meets(searchRequest); if (cannotSearchProvidedOrConvertableId && !queryGenerationEnabled) { String message = String.format("Not using %s because the search did not provide any ID that the indexer can handle and query generation is disabled", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No usable ID"); } } return true; } | IndexerForSearchSelector { protected boolean checkSearchId(Indexer indexer) { boolean needToSearchById = !searchRequest.getIdentifiers().isEmpty() && !searchRequest.getQuery().isPresent(); if (needToSearchById) { boolean canUseAnyProvidedId = !Collections.disjoint(searchRequest.getIdentifiers().keySet(), indexer.getConfig().getSupportedSearchIds()); boolean cannotSearchProvidedOrConvertableId = !canUseAnyProvidedId && !infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), Sets.newHashSet(indexer.getConfig().getSupportedSearchIds())); boolean queryGenerationEnabled = configProvider.getBaseConfig().getSearching().getGenerateQueries().meets(searchRequest); if (cannotSearchProvidedOrConvertableId && !queryGenerationEnabled) { String message = String.format("Not using %s because the search did not provide any ID that the indexer can handle and query generation is disabled", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No usable ID"); } } return true; } } | IndexerForSearchSelector { protected boolean checkSearchId(Indexer indexer) { boolean needToSearchById = !searchRequest.getIdentifiers().isEmpty() && !searchRequest.getQuery().isPresent(); if (needToSearchById) { boolean canUseAnyProvidedId = !Collections.disjoint(searchRequest.getIdentifiers().keySet(), indexer.getConfig().getSupportedSearchIds()); boolean cannotSearchProvidedOrConvertableId = !canUseAnyProvidedId && !infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), Sets.newHashSet(indexer.getConfig().getSupportedSearchIds())); boolean queryGenerationEnabled = configProvider.getBaseConfig().getSearching().getGenerateQueries().meets(searchRequest); if (cannotSearchProvidedOrConvertableId && !queryGenerationEnabled) { String message = String.format("Not using %s because the search did not provide any ID that the indexer can handle and query generation is disabled", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No usable ID"); } } return true; } } | IndexerForSearchSelector { protected boolean checkSearchId(Indexer indexer) { boolean needToSearchById = !searchRequest.getIdentifiers().isEmpty() && !searchRequest.getQuery().isPresent(); if (needToSearchById) { boolean canUseAnyProvidedId = !Collections.disjoint(searchRequest.getIdentifiers().keySet(), indexer.getConfig().getSupportedSearchIds()); boolean cannotSearchProvidedOrConvertableId = !canUseAnyProvidedId && !infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), Sets.newHashSet(indexer.getConfig().getSupportedSearchIds())); boolean queryGenerationEnabled = configProvider.getBaseConfig().getSearching().getGenerateQueries().meets(searchRequest); if (cannotSearchProvidedOrConvertableId && !queryGenerationEnabled) { String message = String.format("Not using %s because the search did not provide any ID that the indexer can handle and query generation is disabled", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No usable ID"); } } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); } | IndexerForSearchSelector { protected boolean checkSearchId(Indexer indexer) { boolean needToSearchById = !searchRequest.getIdentifiers().isEmpty() && !searchRequest.getQuery().isPresent(); if (needToSearchById) { boolean canUseAnyProvidedId = !Collections.disjoint(searchRequest.getIdentifiers().keySet(), indexer.getConfig().getSupportedSearchIds()); boolean cannotSearchProvidedOrConvertableId = !canUseAnyProvidedId && !infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), Sets.newHashSet(indexer.getConfig().getSupportedSearchIds())); boolean queryGenerationEnabled = configProvider.getBaseConfig().getSearching().getGenerateQueries().meets(searchRequest); if (cannotSearchProvidedOrConvertableId && !queryGenerationEnabled) { String message = String.format("Not using %s because the search did not provide any ID that the indexer can handle and query generation is disabled", indexer.getName()); return handleIndexerNotSelected(indexer, message, "No usable ID"); } } return true; } IndexerForSearchSelection pickIndexers(SearchRequest searchRequest); static final Pattern SCHEDULER_PATTERN; } |
@Test public void shouldRemoveTrailingTtFromImdbId() throws Exception { testee.config = new IndexerConfig(); testee.config.setSupportedSearchIds(Lists.newArrayList(MediaIdType.IMDB)); SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getIdentifiers().put(MediaIdType.IMDB, "12345"); UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http: builder = testee.extendQueryUrlWithSearchIds(searchRequest, builder); MultiValueMap<String, String> params = builder.build().getQueryParams(); assertTrue(params.containsKey("imdbid")); assertEquals(1, params.size()); assertEquals("12345", params.get("imdbid").get(0)); verify(infoProviderMock, never()).convert(anyString(), any(MediaIdType.class)); } | protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerAuthException.class) public void shouldThrowAuthException() throws Exception { doReturn(new NewznabXmlError("101", "Wrong API key")).when(testee).getAndStoreResultToDatabase(any(), eq(Xml.class), eq(IndexerApiAccessType.SEARCH)); doNothing().when(testee).handleFailure(errorMessageCaptor.capture(), disabledPermanentlyCaptor.capture(), any(IndexerApiAccessType.class), any(), indexerApiAccessResultCaptor.capture()); testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); } | protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerErrorCodeException.class) public void shouldThrowErrorCodeWhen100ApiHitLimits() throws Exception { doReturn(new NewznabXmlError("100", "Daily Hits Limit Reached\"")).when(testee).getAndStoreResultToDatabase(any(), eq(Xml.class), eq(IndexerApiAccessType.SEARCH)); doNothing().when(testee).handleFailure(errorMessageCaptor.capture(), disabledPermanentlyCaptor.capture(), any(IndexerApiAccessType.class), any(), indexerApiAccessResultCaptor.capture()); testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); } | protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerProgramErrorException.class) public void shouldThrowProgramErrorCodeException() throws Exception { doReturn(new NewznabXmlError("200", "Whatever")).when(testee).getAndStoreResultToDatabase(any(), eq(Xml.class), eq(IndexerApiAccessType.SEARCH)); doNothing().when(testee).handleFailure(errorMessageCaptor.capture(), disabledPermanentlyCaptor.capture(), any(IndexerApiAccessType.class), any(), indexerApiAccessResultCaptor.capture()); testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); } | protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } |
@Test(expected = IndexerErrorCodeException.class) public void shouldThrowErrorCodeThatsNotMyFaultException() throws Exception { doReturn(new NewznabXmlError("123", "Whatever")).when(testee).getAndStoreResultToDatabase(any(), eq(Xml.class), eq(IndexerApiAccessType.SEARCH)); doNothing().when(testee).handleFailure(errorMessageCaptor.capture(), disabledPermanentlyCaptor.capture(), any(IndexerApiAccessType.class), any(), indexerApiAccessResultCaptor.capture()); testee.searchInternal(new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100), 0, 100); } | protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected Xml getAndStoreResultToDatabase(URI uri, IndexerApiAccessType apiAccessType) throws IndexerAccessException { Xml response = getAndStoreResultToDatabase(uri, Xml.class, apiAccessType); if (response instanceof NewznabXmlError) { handleRssError((NewznabXmlError) response, uri.toString()); } else if (!(response instanceof NewznabXmlRoot)) { throw new UnknownResponseException("Indexer returned unknown response"); } return response; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldConvertIdIfNecessary() throws Exception { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getIdentifiers().put(MediaIdType.IMDB, "imdbId"); testee.config.getSupportedSearchIds().add(MediaIdType.TMDB); when(infoProviderMock.canConvertAny(anySet(), anySet())).thenReturn(true); testee.extendQueryUrlWithSearchIds(searchRequest, uriComponentsBuilderMock); verify(uriComponentsBuilderMock).queryParam("tmdbid", "tmdbId"); } | protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } |
@Test public void shouldNotConvertIdIfNotNecessary() throws Exception { SearchRequest searchRequest = new SearchRequest(SearchSource.INTERNAL, SearchType.SEARCH, 0, 100); searchRequest.getIdentifiers().put(MediaIdType.TMDB, "tmdbId"); testee.extendQueryUrlWithSearchIds(searchRequest, uriComponentsBuilderMock); verify(infoProviderMock, never()).convert(anyString(), eq(MediaIdType.TMDB)); } | protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } | Newznab extends Indexer<Xml> { protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchRequest, UriComponentsBuilder componentsBuilder) { if (!searchRequest.getIdentifiers().isEmpty()) { Map<MediaIdType, String> params = new HashMap<>(); boolean idConversionNeeded = isIdConversionNeeded(searchRequest); if (idConversionNeeded) { boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds())); if (canConvertAnyId) { try { MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers()); if (info.getImdbId().isPresent()) { if (searchRequest.getSearchType() == SearchType.MOVIE && config.getSupportedSearchIds().contains(MediaIdType.IMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } if (searchRequest.getSearchType() == SearchType.TVSEARCH && config.getSupportedSearchIds().contains(MediaIdType.TVIMDB)) { params.put(MediaIdType.IMDB, info.getImdbId().get().replace("tt", "")); } } if (info.getTmdbId().isPresent()) { params.put(MediaIdType.TMDB, info.getTmdbId().get()); } if (info.getTvRageId().isPresent()) { params.put(MediaIdType.TVRAGE, info.getTvRageId().get()); } if (info.getTvMazeId().isPresent()) { params.put(MediaIdType.TVMAZE, info.getTvMazeId().get()); } if (info.getTvDbId().isPresent()) { params.put(MediaIdType.TVDB, info.getTvDbId().get()); } } catch (InfoProviderException e) { error("Error while converting search ID", e); } } else { debug("Unable to convert any of the provided IDs to any of these supported IDs: {}", Joiner.on(", ").join(config.getSupportedSearchIds())); } if (params.isEmpty()) { warn("Didn't find any usable IDs to add to search request"); } } params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value)); for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) { if (entry.getValue() == null) { continue; } if (!config.getSupportedSearchIds().contains(entry.getKey())) { continue; } componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", "")); } } return componentsBuilder; } @Override NfoResult getNfo(String guid); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.