Make sure this is set up before the test runs

--- src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
+++ src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
@@ -2,7 +2,12 @@

 import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
 import com.hubspot.dropwizard.guice.objects.ExplicitResource;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
+
 import io.dropwizard.testing.junit.ResourceTestRule;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;

@@ -13,6 +18,10 @@
  * See: https://github.com/dropwizard/dropwizard/issues/828 and http://permalink.gmane.org/gmane.comp.java.dropwizard.devel/376
  */
 public class InjectedResourcesTest {
+
+    static {
+        JerseyGuiceUtils.reset();
+    }

     @ClassRule
     public static final ResourceTestRule resources = ResourceTestRule.builder()

<|original_code|>
package com.hubspot.dropwizard.guice;

import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
import com.hubspot.dropwizard.guice.objects.ExplicitResource;
import io.dropwizard.testing.junit.ResourceTestRule;
import org.junit.ClassRule;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;

/**
 * this test is created to address to Null Pointer Exceptions in JerseyTest.teardown() related to ServiceLocator
 * See: https://github.com/dropwizard/dropwizard/issues/828 and http://permalink.gmane.org/gmane.comp.java.dropwizard.devel/376
 */
public class InjectedResourcesTest {

    @ClassRule
    public static final ResourceTestRule resources = ResourceTestRule.builder()
            .addResource(new ExplicitResource(new ExplicitDAO()))
            .build();

    @Test
    public void shouldGetExplicitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }

    @Test
    public void shouldGetJitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }
}

<|edits_diff|>
--- src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
+++ src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
@@ -2,7 +2,12 @@

 import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
 import com.hubspot.dropwizard.guice.objects.ExplicitResource;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
+
 import io.dropwizard.testing.junit.ResourceTestRule;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;

<|current_version|>
package com.hubspot.dropwizard.guice;

import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
import com.hubspot.dropwizard.guice.objects.ExplicitResource;
import com.squarespace.jersey2.guice.JerseyGuiceUtils;

import io.dropwizard.testing.junit.ResourceTestRule;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;

/**
 * this test is created to address to Null Pointer Exceptions in JerseyTest.teardown() related to ServiceLocator
 * See: https://github.com/dropwizard/dropwizard/issues/828 and http://permalink.gmane.org/gmane.comp.java.dropwizard.devel/376
 */
public class InjectedResourcesTest {

    @ClassRule
    public static final ResourceTestRule resources = ResourceTestRule.builder()
            .addResource(new ExplicitResource(new ExplicitDAO()))
            .build();

    @Test
    public void shouldGetExplicitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }

    @Test
    public void shouldGetJitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }
}

<|next_version|>
package com.hubspot.dropwizard.guice;

import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
import com.hubspot.dropwizard.guice.objects.ExplicitResource;
import com.squarespace.jersey2.guice.JerseyGuiceUtils;

import io.dropwizard.testing.junit.ResourceTestRule;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;

/**
 * this test is created to address to Null Pointer Exceptions in JerseyTest.teardown() related to ServiceLocator
 * See: https://github.com/dropwizard/dropwizard/issues/828 and http://permalink.gmane.org/gmane.comp.java.dropwizard.devel/376
 */
public class InjectedResourcesTest {

    static {
        JerseyGuiceUtils.reset();
    }

    @ClassRule
    public static final ResourceTestRule resources = ResourceTestRule.builder()
            .addResource(new ExplicitResource(new ExplicitDAO()))
            .build();

    @Test
    public void shouldGetExplicitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }

    @Test
    public void shouldGetJitMessage() {
        // when
        String message = resources.client().target("/explicit/message").request().get(String.class);

        // then
        assertThat(message).isEqualTo("this DAO was bound explicitly");
    }
}


Make test cleanup after itself

Make test cleanup after itself

--- tools/table-server/src/test/java/org/jmeterplugins/protocol/http/control/STSInstallerTest.java
+++ tools/table-server/src/test/java/org/jmeterplugins/protocol/http/control/STSInstallerTest.java
@@ -1,5 +1,6 @@
 package org.jmeterplugins.protocol.http.control;

+import org.apache.commons.io.FileUtils;
 import org.junit.Test;

 import java.io.File;
@@ -13,5 +14,7 @@
         dest.mkdirs();

         STSInstaller.main(new String[0]);
+
+        FileUtils.deleteDirectory(dest);
     }
 }

<|original_code|>
package org.jmeterplugins.protocol.http.control;

import org.junit.Test;

import java.io.File;

public class STSInstallerTest {
    @Test
    public void name() throws Exception {
        File self = new File(STSInstaller.class.getProtectionDomain().getCodeSource().getLocation().getFile());
        String home = self.getParentFile().getParentFile().getParent();
        File dest = new File(home + File.separator + "bin");
        dest.mkdirs();

        STSInstaller.main(new String[0]);
    }
}
<|edits_diff|>
--- tools/table-server/src/test/java/org/jmeterplugins/protocol/http/control/STSInstallerTest.java
+++ tools/table-server/src/test/java/org/jmeterplugins/protocol/http/control/STSInstallerTest.java
@@ -1,5 +1,6 @@
 package org.jmeterplugins.protocol.http.control;

+import org.apache.commons.io.FileUtils;
 import org.junit.Test;

 import java.io.File;
<|current_version|>
package org.jmeterplugins.protocol.http.control;

import org.apache.commons.io.FileUtils;
import org.junit.Test;

import java.io.File;

public class STSInstallerTest {
    @Test
    public void name() throws Exception {
        File self = new File(STSInstaller.class.getProtectionDomain().getCodeSource().getLocation().getFile());
        String home = self.getParentFile().getParentFile().getParent();
        File dest = new File(home + File.separator + "bin");
        dest.mkdirs();

        STSInstaller.main(new String[0]);
    }
}
<|next_version|>
package org.jmeterplugins.protocol.http.control;

import org.apache.commons.io.FileUtils;
import org.junit.Test;

import java.io.File;

public class STSInstallerTest {
    @Test
    public void name() throws Exception {
        File self = new File(STSInstaller.class.getProtectionDomain().getCodeSource().getLocation().getFile());
        String home = self.getParentFile().getParentFile().getParent();
        File dest = new File(home + File.separator + "bin");
        dest.mkdirs();

        STSInstaller.main(new String[0]);

        FileUtils.deleteDirectory(dest);
    }
}


Add GC Data publish method

Add GC Data publish method

--- jvm-monitor-agent/src/main/java/communicator/DASPublisher.java
+++ jvm-monitor-agent/src/main/java/communicator/DASPublisher.java
@@ -1,6 +1,9 @@
 package communicator;

+import jvmmonitor.model.GarbageCollectionLog;
 import jvmmonitor.model.MemoryUsageLog;
+
+import java.util.List;

 /*
 *  Copyright (c) ${date}, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
@@ -19,7 +22,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
 public class DASPublisher {
     public void publishMemoryData(MemoryUsageLog memoryUsageLog) {
     }
+
+    public void publishGCData(List<GarbageCollectionLog> garbageCollectionLog) {
+    }
 }

<|original_code|>
package communicator;

import jvmmonitor.model.MemoryUsageLog;

/*
*  Copyright (c) ${date}, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
*  WSO2 Inc. licenses this file to you under the Apache License,
*  Version 2.0 (the "License"); you may not use this file except
*  in compliance with the License.
*  You may obtain a copy of the License at
*
*    http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied.  See the License for the
* specific language governing permissions and limitations
* under the License.
*/
public class DASPublisher {
    public void publishMemoryData(MemoryUsageLog memoryUsageLog) {
    }
}

<|edits_diff|>
--- jvm-monitor-agent/src/main/java/communicator/DASPublisher.java
+++ jvm-monitor-agent/src/main/java/communicator/DASPublisher.java
@@ -1,6 +1,9 @@
 package communicator;

+import jvmmonitor.model.GarbageCollectionLog;
 import jvmmonitor.model.MemoryUsageLog;
+
+import java.util.List;

 /*
 *  Copyright (c) ${date}, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
@@ -19,6 +22,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
+
 public class DASPublisher {
     public void publishMemoryData(MemoryUsageLog memoryUsageLog) {
     }
<|current_version|>
package communicator;

import jvmmonitor.model.GarbageCollectionLog;
import jvmmonitor.model.MemoryUsageLog;

import java.util.List;

/*
*  Copyright (c) ${date}, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
*  WSO2 Inc. licenses this file to you under the Apache License,
*  Version 2.0 (the "License"); you may not use this file except
*  in compliance with the License.
*  You may obtain a copy of the License at
*
*    http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied.  See the License for the
* specific language governing permissions and limitations
* under the License.
*/

public class DASPublisher {
    public void publishMemoryData(MemoryUsageLog memoryUsageLog) {
    }
}

<|next_version|>
package communicator;

import jvmmonitor.model.GarbageCollectionLog;
import jvmmonitor.model.MemoryUsageLog;

import java.util.List;

/*
*  Copyright (c) ${date}, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
*  WSO2 Inc. licenses this file to you under the Apache License,
*  Version 2.0 (the "License"); you may not use this file except
*  in compliance with the License.
*  You may obtain a copy of the License at
*
*    http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied.  See the License for the
* specific language governing permissions and limitations
* under the License.
*/

public class DASPublisher {
    public void publishMemoryData(MemoryUsageLog memoryUsageLog) {
    }

    public void publishGCData(List<GarbageCollectionLog> garbageCollectionLog) {
    }
}


Add @Provides to watchdogs resource

restapi: Add @Provides to watchdogs resource

Currently the watchdogs resource doesn't have a @Provides annotation. In
theory this shouldn't be required as the annotation is in the base
class. But in practice the application server reacts differently, in
particular if the annotation isn't present the server won't use use the
JAXB or JSON providers when the "Accept" header doesn't have a value.
This means that requests like this:

  DELETE /vms/{vm:id}/watchdogs/{watchdog:id}

Will fail with the following error message:

  Could not find MessageBodyWriter for response object of type:
  org.ovirt.engine.api.model.Action of media type:
  application/octet-stream

This specific problem can be resolved adding the "Accept" header to the
request, and that is good practice. For backwards compatibility sake
this patch adds the annotation.

Change-Id: I1bcb6263450be603b21e398196c6713ad599ce25
Bug-Url: https://bugzilla.redhat.com/1250046
Signed-off-by: Juan Hernandez <59e5b8140de97cc91c3fb6c5342dce948469af8c@redhat.com>
(cherry picked from commit e494a557b00d6a4028fed172fb3ad1d8e276733a)

--- backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogResource.java
+++ backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogResource.java
@@ -1,10 +1,12 @@
 package org.ovirt.engine.api.resource;

 import javax.ws.rs.DELETE;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;

 import org.ovirt.engine.api.model.WatchDog;

+@Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML})
 public interface WatchdogResource extends DeviceResource<WatchDog> {
     @DELETE
     Response remove();

<|original_code|>
package org.ovirt.engine.api.resource;

import javax.ws.rs.DELETE;
import javax.ws.rs.core.Response;

import org.ovirt.engine.api.model.WatchDog;

public interface WatchdogResource extends DeviceResource<WatchDog> {
    @DELETE
    Response remove();
}

<|edits_diff|>
--- backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogResource.java
+++ backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/WatchdogResource.java
@@ -1,6 +1,7 @@
 package org.ovirt.engine.api.resource;

 import javax.ws.rs.DELETE;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;

 import org.ovirt.engine.api.model.WatchDog;
<|current_version|>
package org.ovirt.engine.api.resource;

import javax.ws.rs.DELETE;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;

import org.ovirt.engine.api.model.WatchDog;

public interface WatchdogResource extends DeviceResource<WatchDog> {
    @DELETE
    Response remove();
}

<|next_version|>
package org.ovirt.engine.api.resource;

import javax.ws.rs.DELETE;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;

import org.ovirt.engine.api.model.WatchDog;

@Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML})
public interface WatchdogResource extends DeviceResource<WatchDog> {
    @DELETE
    Response remove();
}


Add worker thread annotation to update notification.

--- library/src/main/java/com/novoda/downloadmanager/NotificationDispatcher.java
+++ library/src/main/java/com/novoda/downloadmanager/NotificationDispatcher.java
@@ -1,4 +1,6 @@
 package com.novoda.downloadmanager;
+
+import android.support.annotation.WorkerThread;

 import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DELETION;
 import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DOWNLOADED;
@@ -15,6 +17,7 @@
         this.notificationCreator = notificationCreator;
     }

+    @WorkerThread
     void updateNotification(DownloadBatchStatus downloadBatchStatus) {
         WaitForDownloadService.<Void>waitFor(downloadService, waitForDownloadService)
                 .thenPerform(executeUpdateNotification(downloadBatchStatus));

<|original_code|>
package com.novoda.downloadmanager;

import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DELETION;
import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DOWNLOADED;

class NotificationDispatcher {

    private final Object waitForDownloadService;
    private final NotificationCreator<DownloadBatchStatus> notificationCreator;

    private DownloadService downloadService;

    NotificationDispatcher(Object waitForDownloadService, NotificationCreator<DownloadBatchStatus> notificationCreator) {
        this.waitForDownloadService = waitForDownloadService;
        this.notificationCreator = notificationCreator;
    }

    void updateNotification(DownloadBatchStatus downloadBatchStatus) {
        WaitForDownloadService.<Void>waitFor(downloadService, waitForDownloadService)
                .thenPerform(executeUpdateNotification(downloadBatchStatus));
    }

    private WaitForDownloadService.ThenPerform.Action<Void> executeUpdateNotification(DownloadBatchStatus downloadBatchStatus) {
        return () -> {
            NotificationInformation notificationInformation = notificationCreator.createNotification(downloadBatchStatus);

            if (downloadBatchStatus.status() == DOWNLOADED || downloadBatchStatus.status() == DELETION) {
                downloadService.stackNotification(notificationInformation);
            } else {
                downloadService.updateNotification(notificationInformation);
            }

            return null;
        };
    }

    void setDownloadService(DownloadService downloadService) {
        this.downloadService = downloadService;
    }
}

<|edits_diff|>
--- library/src/main/java/com/novoda/downloadmanager/NotificationDispatcher.java
+++ library/src/main/java/com/novoda/downloadmanager/NotificationDispatcher.java
@@ -1,4 +1,6 @@
 package com.novoda.downloadmanager;
+
+import android.support.annotation.WorkerThread;

 import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DELETION;
 import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DOWNLOADED;
<|current_version|>
package com.novoda.downloadmanager;

import android.support.annotation.WorkerThread;

import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DELETION;
import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DOWNLOADED;

class NotificationDispatcher {

    private final Object waitForDownloadService;
    private final NotificationCreator<DownloadBatchStatus> notificationCreator;

    private DownloadService downloadService;

    NotificationDispatcher(Object waitForDownloadService, NotificationCreator<DownloadBatchStatus> notificationCreator) {
        this.waitForDownloadService = waitForDownloadService;
        this.notificationCreator = notificationCreator;
    }

    void updateNotification(DownloadBatchStatus downloadBatchStatus) {
        WaitForDownloadService.<Void>waitFor(downloadService, waitForDownloadService)
                .thenPerform(executeUpdateNotification(downloadBatchStatus));
    }

    private WaitForDownloadService.ThenPerform.Action<Void> executeUpdateNotification(DownloadBatchStatus downloadBatchStatus) {
        return () -> {
            NotificationInformation notificationInformation = notificationCreator.createNotification(downloadBatchStatus);

            if (downloadBatchStatus.status() == DOWNLOADED || downloadBatchStatus.status() == DELETION) {
                downloadService.stackNotification(notificationInformation);
            } else {
                downloadService.updateNotification(notificationInformation);
            }

            return null;
        };
    }

    void setDownloadService(DownloadService downloadService) {
        this.downloadService = downloadService;
    }
}

<|next_version|>
package com.novoda.downloadmanager;

import android.support.annotation.WorkerThread;

import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DELETION;
import static com.novoda.downloadmanager.DownloadBatchStatus.Status.DOWNLOADED;

class NotificationDispatcher {

    private final Object waitForDownloadService;
    private final NotificationCreator<DownloadBatchStatus> notificationCreator;

    private DownloadService downloadService;

    NotificationDispatcher(Object waitForDownloadService, NotificationCreator<DownloadBatchStatus> notificationCreator) {
        this.waitForDownloadService = waitForDownloadService;
        this.notificationCreator = notificationCreator;
    }

    @WorkerThread
    void updateNotification(DownloadBatchStatus downloadBatchStatus) {
        WaitForDownloadService.<Void>waitFor(downloadService, waitForDownloadService)
                .thenPerform(executeUpdateNotification(downloadBatchStatus));
    }

    private WaitForDownloadService.ThenPerform.Action<Void> executeUpdateNotification(DownloadBatchStatus downloadBatchStatus) {
        return () -> {
            NotificationInformation notificationInformation = notificationCreator.createNotification(downloadBatchStatus);

            if (downloadBatchStatus.status() == DOWNLOADED || downloadBatchStatus.status() == DELETION) {
                downloadService.stackNotification(notificationInformation);
            } else {
                downloadService.updateNotification(notificationInformation);
            }

            return null;
        };
    }

    void setDownloadService(DownloadService downloadService) {
        this.downloadService = downloadService;
    }
}


Add additional field to result model class of Alchemy api

--- MashupClient/app/src/main/java/cvut/arenaq/mashup/AlchemyApi/GetRankedTaxonomy.java
+++ MashupClient/app/src/main/java/cvut/arenaq/mashup/AlchemyApi/GetRankedTaxonomy.java
@@ -4,11 +4,16 @@

 public class GetRankedTaxonomy {
     private String status;
+    private String statusInfo;
     private String language;
     private List<Taxonomy> taxonomy;

     public String getStatus() {
         return status;
+    }
+
+    public String getStatusInfo() {
+        return statusInfo;
     }

     public String getLanguage() {

<|original_code|>
package cvut.arenaq.mashup.AlchemyApi;

import java.util.List;

public class GetRankedTaxonomy {
    private String status;
    private String language;
    private List<Taxonomy> taxonomy;

    public String getStatus() {
        return status;
    }

    public String getLanguage() {
        return language;
    }

    public List<Taxonomy> getTaxonomy() {
        return taxonomy;
    }
}

<|edits_diff|>
--- MashupClient/app/src/main/java/cvut/arenaq/mashup/AlchemyApi/GetRankedTaxonomy.java
+++ MashupClient/app/src/main/java/cvut/arenaq/mashup/AlchemyApi/GetRankedTaxonomy.java
@@ -4,6 +4,7 @@

 public class GetRankedTaxonomy {
     private String status;
+    private String statusInfo;
     private String language;
     private List<Taxonomy> taxonomy;

<|current_version|>
package cvut.arenaq.mashup.AlchemyApi;

import java.util.List;

public class GetRankedTaxonomy {
    private String status;
    private String statusInfo;
    private String language;
    private List<Taxonomy> taxonomy;

    public String getStatus() {
        return status;
    }

    public String getLanguage() {
        return language;
    }

    public List<Taxonomy> getTaxonomy() {
        return taxonomy;
    }
}

<|next_version|>
package cvut.arenaq.mashup.AlchemyApi;

import java.util.List;

public class GetRankedTaxonomy {
    private String status;
    private String statusInfo;
    private String language;
    private List<Taxonomy> taxonomy;

    public String getStatus() {
        return status;
    }

    public String getStatusInfo() {
        return statusInfo;
    }

    public String getLanguage() {
        return language;
    }

    public List<Taxonomy> getTaxonomy() {
        return taxonomy;
    }
}


Add preference to not load user's default database.

--- RelUI/src/org/reldb/dbrowser/ui/preferences/PreferencePageGeneral.java
+++ RelUI/src/org/reldb/dbrowser/ui/preferences/PreferencePageGeneral.java
@@ -10,6 +10,7 @@
 public class PreferencePageGeneral extends FieldEditorPreferencePage {
 	public static final String LARGE_ICONS = "general.double_icons";
 	public static final String DEFAULT_CMD_MODE = "general.default_cmd_mode";
+	public static final String SKIP_DEFAULT_DB_LOAD = "general.skip_default_db_load";

 	/**
 	 * Constructor
@@ -26,6 +27,8 @@
 		addField(new BooleanFieldEditor(LARGE_ICONS, "&Larger icons." + reloadPrompt, getFieldEditorParent()));

 		addField(new BooleanFieldEditor(DEFAULT_CMD_MODE, "Default to command-line mode.", getFieldEditorParent()));
+
+		addField(new BooleanFieldEditor(SKIP_DEFAULT_DB_LOAD, "Do not automatically load user's default database.", getFieldEditorParent()));
 	}

 }

<|original_code|>
package org.reldb.dbrowser.ui.preferences;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.util.Util;

/**
 * This class creates a preference page
 */
public class PreferencePageGeneral extends FieldEditorPreferencePage {
	public static final String LARGE_ICONS = "general.double_icons";
	public static final String DEFAULT_CMD_MODE = "general.default_cmd_mode";

	/**
	 * Constructor
	 */
	public PreferencePageGeneral() {
		setTitle("General");
		setDescription("General settings.");
	}

	protected void createFieldEditors() {
		String reloadPrompt = "";
		if (!Util.isMac())
			reloadPrompt = "  Restart after changing to see the full effect.";
		addField(new BooleanFieldEditor(LARGE_ICONS, "&Larger icons." + reloadPrompt, getFieldEditorParent()));

		addField(new BooleanFieldEditor(DEFAULT_CMD_MODE, "Default to command-line mode.", getFieldEditorParent()));
	}

}

<|edits_diff|>
--- RelUI/src/org/reldb/dbrowser/ui/preferences/PreferencePageGeneral.java
+++ RelUI/src/org/reldb/dbrowser/ui/preferences/PreferencePageGeneral.java
@@ -10,6 +10,7 @@
 public class PreferencePageGeneral extends FieldEditorPreferencePage {
 	public static final String LARGE_ICONS = "general.double_icons";
 	public static final String DEFAULT_CMD_MODE = "general.default_cmd_mode";
+	public static final String SKIP_DEFAULT_DB_LOAD = "general.skip_default_db_load";

 	/**
 	 * Constructor
<|current_version|>
package org.reldb.dbrowser.ui.preferences;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.util.Util;

/**
 * This class creates a preference page
 */
public class PreferencePageGeneral extends FieldEditorPreferencePage {
	public static final String LARGE_ICONS = "general.double_icons";
	public static final String DEFAULT_CMD_MODE = "general.default_cmd_mode";
	public static final String SKIP_DEFAULT_DB_LOAD = "general.skip_default_db_load";

	/**
	 * Constructor
	 */
	public PreferencePageGeneral() {
		setTitle("General");
		setDescription("General settings.");
	}

	protected void createFieldEditors() {
		String reloadPrompt = "";
		if (!Util.isMac())
			reloadPrompt = "  Restart after changing to see the full effect.";
		addField(new BooleanFieldEditor(LARGE_ICONS, "&Larger icons." + reloadPrompt, getFieldEditorParent()));

		addField(new BooleanFieldEditor(DEFAULT_CMD_MODE, "Default to command-line mode.", getFieldEditorParent()));
	}

}

<|next_version|>
package org.reldb.dbrowser.ui.preferences;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.util.Util;

/**
 * This class creates a preference page
 */
public class PreferencePageGeneral extends FieldEditorPreferencePage {
	public static final String LARGE_ICONS = "general.double_icons";
	public static final String DEFAULT_CMD_MODE = "general.default_cmd_mode";
	public static final String SKIP_DEFAULT_DB_LOAD = "general.skip_default_db_load";

	/**
	 * Constructor
	 */
	public PreferencePageGeneral() {
		setTitle("General");
		setDescription("General settings.");
	}

	protected void createFieldEditors() {
		String reloadPrompt = "";
		if (!Util.isMac())
			reloadPrompt = "  Restart after changing to see the full effect.";
		addField(new BooleanFieldEditor(LARGE_ICONS, "&Larger icons." + reloadPrompt, getFieldEditorParent()));

		addField(new BooleanFieldEditor(DEFAULT_CMD_MODE, "Default to command-line mode.", getFieldEditorParent()));

		addField(new BooleanFieldEditor(SKIP_DEFAULT_DB_LOAD, "Do not automatically load user's default database.", getFieldEditorParent()));
	}

}


Add @Category(NeedsCdmUnitTest.class) to new unit test

--- cdm-test/src/test/java/ucar/nc2/dt/grid/TestReadProblem.java
+++ cdm-test/src/test/java/ucar/nc2/dt/grid/TestReadProblem.java
@@ -5,12 +5,15 @@
 package ucar.nc2.dt.grid;

 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import ucar.unidata.util.test.TestDir;
+import ucar.unidata.util.test.category.NeedsCdmUnitTest;

 /** Open specific problem dataset with GridDataset.open(). */
 public class TestReadProblem {

   @Test
+  @Category(NeedsCdmUnitTest.class)
   public void doOne() throws Exception {
     TestReadandCount.doOne(TestDir.cdmUnitTestDir + "formats/grib2/", "eta218.wmo", 57, 16, 20, 11);
   }

<|original_code|>
/*
 * Copyright (c) 1998-2020 John Caron and University Corporation for Atmospheric Research/Unidata
 *  See LICENSE for license information.
 */
package ucar.nc2.dt.grid;

import org.junit.Test;
import ucar.unidata.util.test.TestDir;

/** Open specific problem dataset with GridDataset.open(). */
public class TestReadProblem {

  @Test
  public void doOne() throws Exception {
    TestReadandCount.doOne(TestDir.cdmUnitTestDir + "formats/grib2/", "eta218.wmo", 57, 16, 20, 11);
  }

}

<|edits_diff|>
--- cdm-test/src/test/java/ucar/nc2/dt/grid/TestReadProblem.java
+++ cdm-test/src/test/java/ucar/nc2/dt/grid/TestReadProblem.java
@@ -5,7 +5,9 @@
 package ucar.nc2.dt.grid;

 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import ucar.unidata.util.test.TestDir;
+import ucar.unidata.util.test.category.NeedsCdmUnitTest;

 /** Open specific problem dataset with GridDataset.open(). */
 public class TestReadProblem {
<|current_version|>
/*
 * Copyright (c) 1998-2020 John Caron and University Corporation for Atmospheric Research/Unidata
 *  See LICENSE for license information.
 */
package ucar.nc2.dt.grid;

import org.junit.Test;
import org.junit.experimental.categories.Category;
import ucar.unidata.util.test.TestDir;
import ucar.unidata.util.test.category.NeedsCdmUnitTest;

/** Open specific problem dataset with GridDataset.open(). */
public class TestReadProblem {

  @Test
  public void doOne() throws Exception {
    TestReadandCount.doOne(TestDir.cdmUnitTestDir + "formats/grib2/", "eta218.wmo", 57, 16, 20, 11);
  }

}

<|next_version|>
/*
 * Copyright (c) 1998-2020 John Caron and University Corporation for Atmospheric Research/Unidata
 *  See LICENSE for license information.
 */
package ucar.nc2.dt.grid;

import org.junit.Test;
import org.junit.experimental.categories.Category;
import ucar.unidata.util.test.TestDir;
import ucar.unidata.util.test.category.NeedsCdmUnitTest;

/** Open specific problem dataset with GridDataset.open(). */
public class TestReadProblem {

  @Test
  @Category(NeedsCdmUnitTest.class)
  public void doOne() throws Exception {
    TestReadandCount.doOne(TestDir.cdmUnitTestDir + "formats/grib2/", "eta218.wmo", 57, 16, 20, 11);
  }

}


Fix name of source UUID attribute

Fix name of source UUID attribute

--- DND/src/edu/teco/dnd/network/messages/Response.java
+++ DND/src/edu/teco/dnd/network/messages/Response.java
@@ -1,6 +1,8 @@
 package edu.teco.dnd.network.messages;

 import java.util.UUID;
+
+import com.google.gson.annotations.SerializedName;

 /**
  * A Message that is sent as a Response for another Message.
@@ -11,6 +13,7 @@
 	/**
 	 * The UUID of the Message this is a response to.
 	 */
+	@SerializedName("sourceuuid")
 	private final UUID sourceUUID;

 	/**

<|original_code|>
package edu.teco.dnd.network.messages;

import java.util.UUID;

/**
 * A Message that is sent as a Response for another Message.
 *
 * @author Philipp Adolf
 */
public abstract class Response extends Message {
	/**
	 * The UUID of the Message this is a response to.
	 */
	private final UUID sourceUUID;

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 * @param uuid the UUID for this Message
	 */
	public Response(final UUID sourceUUID, final UUID uuid) {
		super(uuid);
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 */
	public Response(final UUID sourceUUID) {
		super();
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Returns the UUID of the Message this is a response to.
	 *
	 * @return the UUID of the Message this is a response to
	 */
	public UUID getSourceUUID() {
		return this.sourceUUID;
	}
}

<|edits_diff|>
--- DND/src/edu/teco/dnd/network/messages/Response.java
+++ DND/src/edu/teco/dnd/network/messages/Response.java
@@ -1,6 +1,8 @@
 package edu.teco.dnd.network.messages;

 import java.util.UUID;
+
+import com.google.gson.annotations.SerializedName;

 /**
  * A Message that is sent as a Response for another Message.
<|current_version|>
package edu.teco.dnd.network.messages;

import java.util.UUID;

import com.google.gson.annotations.SerializedName;

/**
 * A Message that is sent as a Response for another Message.
 *
 * @author Philipp Adolf
 */
public abstract class Response extends Message {
	/**
	 * The UUID of the Message this is a response to.
	 */
	private final UUID sourceUUID;

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 * @param uuid the UUID for this Message
	 */
	public Response(final UUID sourceUUID, final UUID uuid) {
		super(uuid);
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 */
	public Response(final UUID sourceUUID) {
		super();
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Returns the UUID of the Message this is a response to.
	 *
	 * @return the UUID of the Message this is a response to
	 */
	public UUID getSourceUUID() {
		return this.sourceUUID;
	}
}

<|next_version|>
package edu.teco.dnd.network.messages;

import java.util.UUID;

import com.google.gson.annotations.SerializedName;

/**
 * A Message that is sent as a Response for another Message.
 *
 * @author Philipp Adolf
 */
public abstract class Response extends Message {
	/**
	 * The UUID of the Message this is a response to.
	 */
	@SerializedName("sourceuuid")
	private final UUID sourceUUID;

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 * @param uuid the UUID for this Message
	 */
	public Response(final UUID sourceUUID, final UUID uuid) {
		super(uuid);
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Initializes a new Response.
	 *
	 * @param sourceUUID the UUID of the Message this is a response to
	 */
	public Response(final UUID sourceUUID) {
		super();
		this.sourceUUID = sourceUUID;
	}

	/**
	 * Returns the UUID of the Message this is a response to.
	 *
	 * @return the UUID of the Message this is a response to
	 */
	public UUID getSourceUUID() {
		return this.sourceUUID;
	}
}


Add an E4 context on current plugin.

Add an E4 context on current plugin.

--- e4/com.opcoach.training.e4.rental.ui/src/com/opcoach/training/e4/rental/ui/RentalUIActivator.java
+++ e4/com.opcoach.training.e4.rental.ui/src/com/opcoach/training/e4/rental/ui/RentalUIActivator.java
@@ -1,5 +1,7 @@
 package com.opcoach.training.e4.rental.ui;

+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

@@ -20,6 +22,8 @@
 	 */
 	public void start(BundleContext bcontext) throws Exception
 	{
+		IEclipseContext ct = EclipseContextFactory.getServiceContext(bcontext);
+		ct.set(RentalUIConstants.PLUGIN_ID + "context", "My value");

 	}

<|original_code|>
package com.opcoach.training.e4.rental.ui;

import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

/**
 * The activator class controls the plug-in life cycle This class must be
 * registered as a LifeCycleURI to fill the context
 */
public class RentalUIActivator implements BundleActivator
{

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
	 * )
	 */
	public void start(BundleContext bcontext) throws Exception
	{

	}

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
	 * )
	 */
	public void stop(BundleContext context) throws Exception
	{

	}

}

<|edits_diff|>
--- e4/com.opcoach.training.e4.rental.ui/src/com/opcoach/training/e4/rental/ui/RentalUIActivator.java
+++ e4/com.opcoach.training.e4.rental.ui/src/com/opcoach/training/e4/rental/ui/RentalUIActivator.java
@@ -1,5 +1,7 @@
 package com.opcoach.training.e4.rental.ui;

+import org.eclipse.e4.core.contexts.EclipseContextFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

<|current_version|>
package com.opcoach.training.e4.rental.ui;

import org.eclipse.e4.core.contexts.EclipseContextFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

/**
 * The activator class controls the plug-in life cycle This class must be
 * registered as a LifeCycleURI to fill the context
 */
public class RentalUIActivator implements BundleActivator
{

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
	 * )
	 */
	public void start(BundleContext bcontext) throws Exception
	{

	}

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
	 * )
	 */
	public void stop(BundleContext context) throws Exception
	{

	}

}

<|next_version|>
package com.opcoach.training.e4.rental.ui;

import org.eclipse.e4.core.contexts.EclipseContextFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

/**
 * The activator class controls the plug-in life cycle This class must be
 * registered as a LifeCycleURI to fill the context
 */
public class RentalUIActivator implements BundleActivator
{

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
	 * )
	 */
	public void start(BundleContext bcontext) throws Exception
	{
		IEclipseContext ct = EclipseContextFactory.getServiceContext(bcontext);
		ct.set(RentalUIConstants.PLUGIN_ID + "context", "My value");

	}

	/*
	 * (non-Javadoc)
	 *
	 * @see
	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
	 * )
	 */
	public void stop(BundleContext context) throws Exception
	{

	}

}


Add prototype for timestamp function

Add prototype for timestamp function

--- src/main/java/org/cryptonit/cloud/timestamping/Authority.java
+++ src/main/java/org/cryptonit/cloud/timestamping/Authority.java
@@ -1,5 +1,6 @@
 package org.cryptonit.cloud.timestamping;

+import org.bouncycastle.tsp.*;
 import org.bouncycastle.util.Store;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +15,11 @@
     X509Certificate crt;
     Store certs;

+    public TimeStampResponse timestamp(TimeStampRequest request) {
+        TimeStampResponse response = null;
+        return response;
+    }
+
     public Authority(KeyPair key, X509Certificate crt, Store certs) {
         LOGGER = LoggerFactory.getLogger(Authority.class);

<|original_code|>
package org.cryptonit.cloud.timestamping;

import org.bouncycastle.util.Store;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.*;
import java.security.cert.X509Certificate;
/**
 * @author Mathias Brossard
 */
public class Authority {
    private static Logger LOGGER;
    KeyPair key;
    X509Certificate crt;
    Store certs;

    public Authority(KeyPair key, X509Certificate crt, Store certs) {
        LOGGER = LoggerFactory.getLogger(Authority.class);

        this.key = key;
        this.crt = crt;
        this.certs = certs;
    }
}

<|edits_diff|>
--- src/main/java/org/cryptonit/cloud/timestamping/Authority.java
+++ src/main/java/org/cryptonit/cloud/timestamping/Authority.java
@@ -1,5 +1,6 @@
 package org.cryptonit.cloud.timestamping;

+import org.bouncycastle.tsp.*;
 import org.bouncycastle.util.Store;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
<|current_version|>
package org.cryptonit.cloud.timestamping;

import org.bouncycastle.tsp.*;
import org.bouncycastle.util.Store;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.*;
import java.security.cert.X509Certificate;
/**
 * @author Mathias Brossard
 */
public class Authority {
    private static Logger LOGGER;
    KeyPair key;
    X509Certificate crt;
    Store certs;

    public Authority(KeyPair key, X509Certificate crt, Store certs) {
        LOGGER = LoggerFactory.getLogger(Authority.class);

        this.key = key;
        this.crt = crt;
        this.certs = certs;
    }
}

<|next_version|>
package org.cryptonit.cloud.timestamping;

import org.bouncycastle.tsp.*;
import org.bouncycastle.util.Store;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.*;
import java.security.cert.X509Certificate;
/**
 * @author Mathias Brossard
 */
public class Authority {
    private static Logger LOGGER;
    KeyPair key;
    X509Certificate crt;
    Store certs;

    public TimeStampResponse timestamp(TimeStampRequest request) {
        TimeStampResponse response = null;
        return response;
    }

    public Authority(KeyPair key, X509Certificate crt, Store certs) {
        LOGGER = LoggerFactory.getLogger(Authority.class);

        this.key = key;
        this.crt = crt;
        this.certs = certs;
    }
}


Use dev profile for integration tests.

Use dev profile for integration tests.

--- backend/src/test/java/ch/zuehlke/campplanner/CampplannerApplicationTests.java
+++ backend/src/test/java/ch/zuehlke/campplanner/CampplannerApplicationTests.java
@@ -3,10 +3,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

 @RunWith(SpringJUnit4ClassRunner.class)
+@ActiveProfiles("dev")
 @SpringApplicationConfiguration(classes = CampplannerApplication.class)
 @WebAppConfiguration
 public class CampplannerApplicationTests {

<|original_code|>
package ch.zuehlke.campplanner;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = CampplannerApplication.class)
@WebAppConfiguration
public class CampplannerApplicationTests {

	@Test
	public void contextLoads() {
	}

}

<|edits_diff|>
--- backend/src/test/java/ch/zuehlke/campplanner/CampplannerApplicationTests.java
+++ backend/src/test/java/ch/zuehlke/campplanner/CampplannerApplicationTests.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

<|current_version|>
package ch.zuehlke.campplanner;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = CampplannerApplication.class)
@WebAppConfiguration
public class CampplannerApplicationTests {

	@Test
	public void contextLoads() {
	}

}

<|next_version|>
package ch.zuehlke.campplanner;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;

@RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles("dev")
@SpringApplicationConfiguration(classes = CampplannerApplication.class)
@WebAppConfiguration
public class CampplannerApplicationTests {

	@Test
	public void contextLoads() {
	}

}


Add type field to edit channel perms request

--- WahrDiscordApi/src/main/java/co/phoenixlab/discord/api/request/channel/EditChannelPermissionsRequest.java
+++ WahrDiscordApi/src/main/java/co/phoenixlab/discord/api/request/channel/EditChannelPermissionsRequest.java
@@ -24,7 +24,13 @@
 @AllArgsConstructor
 public class EditChannelPermissionsRequest {

+    public enum Type {
+        MEMBER,
+        ROLE
+    }
+
     private DiscordPermissionSet allow;
     private DiscordPermissionSet deny;
+    private Type type;

 }

<|original_code|>
/*
 * The MIT License (MIT)
 *
 * Copyright (c) 2016 Vincent Zhang/PhoenixLAB
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

package co.phoenixlab.discord.api.request.channel;

import co.phoenixlab.discord.api.entities.guild.DiscordPermissionSet;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class EditChannelPermissionsRequest {

    private DiscordPermissionSet allow;
    private DiscordPermissionSet deny;

}

<|edits_diff|>
--- WahrDiscordApi/src/main/java/co/phoenixlab/discord/api/request/channel/EditChannelPermissionsRequest.java
+++ WahrDiscordApi/src/main/java/co/phoenixlab/discord/api/request/channel/EditChannelPermissionsRequest.java
@@ -24,6 +24,11 @@
 @AllArgsConstructor
 public class EditChannelPermissionsRequest {

+    public enum Type {
+        MEMBER,
+        ROLE
+    }
+
     private DiscordPermissionSet allow;
     private DiscordPermissionSet deny;

<|current_version|>
/*
 * The MIT License (MIT)
 *
 * Copyright (c) 2016 Vincent Zhang/PhoenixLAB
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

package co.phoenixlab.discord.api.request.channel;

import co.phoenixlab.discord.api.entities.guild.DiscordPermissionSet;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class EditChannelPermissionsRequest {

    public enum Type {
        MEMBER,
        ROLE
    }

    private DiscordPermissionSet allow;
    private DiscordPermissionSet deny;

}

<|next_version|>
/*
 * The MIT License (MIT)
 *
 * Copyright (c) 2016 Vincent Zhang/PhoenixLAB
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

package co.phoenixlab.discord.api.request.channel;

import co.phoenixlab.discord.api.entities.guild.DiscordPermissionSet;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class EditChannelPermissionsRequest {

    public enum Type {
        MEMBER,
        ROLE
    }

    private DiscordPermissionSet allow;
    private DiscordPermissionSet deny;
    private Type type;

}


Fix NPE while creating tests.

Fix NPE while creating tests.

--- Client/Client-UI/src/main/java/net/sourceforge/javydreamercsw/client/ui/nodes/actions/CreateTestAction.java
+++ Client/Client-UI/src/main/java/net/sourceforge/javydreamercsw/client/ui/nodes/actions/CreateTestAction.java
@@ -1,8 +1,10 @@
 package net.sourceforge.javydreamercsw.client.ui.nodes.actions;

+import com.validation.manager.core.db.TestPlan;
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
+import org.openide.util.Utilities;

 /**
  *
@@ -23,6 +25,7 @@
             public void run() {
                 final CreateTestDialog dialog =
                         new CreateTestDialog(new javax.swing.JFrame(), true);
+                dialog.setTestPlan(Utilities.actionsGlobalContext().lookup(TestPlan.class));
                 dialog.setLocationRelativeTo(null);
                 dialog.addWindowListener(new java.awt.event.WindowAdapter() {
                     @Override

<|original_code|>
package net.sourceforge.javydreamercsw.client.ui.nodes.actions;

import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.ImageIcon;

/**
 *
 * @author Javier A. Ortiz Bultron <javier.ortiz.78@gmail.com>
 */
public class CreateTestAction extends AbstractAction {

    public CreateTestAction() {
        super("Create Test",
                new ImageIcon("com/validation/manager/resources/icons/Signage/Add Square.png"));
    }

    @Override
    public void actionPerformed(ActionEvent e) {
        /* Create and display the dialog */
        java.awt.EventQueue.invokeLater(new Runnable() {
            @Override
            public void run() {
                final CreateTestDialog dialog =
                        new CreateTestDialog(new javax.swing.JFrame(), true);
                dialog.setLocationRelativeTo(null);
                dialog.addWindowListener(new java.awt.event.WindowAdapter() {
                    @Override
                    public void windowClosing(java.awt.event.WindowEvent e) {
                        dialog.dispose();
                    }
                });
                dialog.setVisible(true);
            }
        });
    }
}

<|edits_diff|>
--- Client/Client-UI/src/main/java/net/sourceforge/javydreamercsw/client/ui/nodes/actions/CreateTestAction.java
+++ Client/Client-UI/src/main/java/net/sourceforge/javydreamercsw/client/ui/nodes/actions/CreateTestAction.java
@@ -1,8 +1,10 @@
 package net.sourceforge.javydreamercsw.client.ui.nodes.actions;

+import com.validation.manager.core.db.TestPlan;
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
+import org.openide.util.Utilities;

 /**
  *
<|current_version|>
package net.sourceforge.javydreamercsw.client.ui.nodes.actions;

import com.validation.manager.core.db.TestPlan;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
import org.openide.util.Utilities;

/**
 *
 * @author Javier A. Ortiz Bultron <javier.ortiz.78@gmail.com>
 */
public class CreateTestAction extends AbstractAction {

    public CreateTestAction() {
        super("Create Test",
                new ImageIcon("com/validation/manager/resources/icons/Signage/Add Square.png"));
    }

    @Override
    public void actionPerformed(ActionEvent e) {
        /* Create and display the dialog */
        java.awt.EventQueue.invokeLater(new Runnable() {
            @Override
            public void run() {
                final CreateTestDialog dialog =
                        new CreateTestDialog(new javax.swing.JFrame(), true);
                dialog.setLocationRelativeTo(null);
                dialog.addWindowListener(new java.awt.event.WindowAdapter() {
                    @Override
                    public void windowClosing(java.awt.event.WindowEvent e) {
                        dialog.dispose();
                    }
                });
                dialog.setVisible(true);
            }
        });
    }
}

<|next_version|>
package net.sourceforge.javydreamercsw.client.ui.nodes.actions;

import com.validation.manager.core.db.TestPlan;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
import org.openide.util.Utilities;

/**
 *
 * @author Javier A. Ortiz Bultron <javier.ortiz.78@gmail.com>
 */
public class CreateTestAction extends AbstractAction {

    public CreateTestAction() {
        super("Create Test",
                new ImageIcon("com/validation/manager/resources/icons/Signage/Add Square.png"));
    }

    @Override
    public void actionPerformed(ActionEvent e) {
        /* Create and display the dialog */
        java.awt.EventQueue.invokeLater(new Runnable() {
            @Override
            public void run() {
                final CreateTestDialog dialog =
                        new CreateTestDialog(new javax.swing.JFrame(), true);
                dialog.setTestPlan(Utilities.actionsGlobalContext().lookup(TestPlan.class));
                dialog.setLocationRelativeTo(null);
                dialog.addWindowListener(new java.awt.event.WindowAdapter() {
                    @Override
                    public void windowClosing(java.awt.event.WindowEvent e) {
                        dialog.dispose();
                    }
                });
                dialog.setVisible(true);
            }
        });
    }
}


Fix DiscoveryManager for DI tests

Fix DiscoveryManager for DI tests

--- eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java
+++ eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java
@@ -4,6 +4,7 @@
 import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.archaius.api.Config;
+import com.netflix.discovery.DiscoveryManager;

 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -26,6 +27,9 @@
     public EurekaInstanceConfig get() {
         if (eurekaInstanceConfig == null) {
             eurekaInstanceConfig = new Ec2EurekaArchaius2InstanceConfig(configInstance, amazonInfoProvider);
+
+            // Copied from CompositeInstanceConfigFactory.get
+            DiscoveryManager.getInstance().setEurekaInstanceConfig(eurekaInstanceConfig);
         }

         return eurekaInstanceConfig;

<|original_code|>
package com.netflix.appinfo.providers;

import com.netflix.appinfo.AmazonInfo;
import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.archaius.api.Config;

import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;

@Singleton
public class CustomAmazonInfoProviderInstanceConfigFactory implements EurekaInstanceConfigFactory {

    private final Config configInstance;
    private final Provider<AmazonInfo> amazonInfoProvider;
    private EurekaInstanceConfig eurekaInstanceConfig;

    @Inject
    public CustomAmazonInfoProviderInstanceConfigFactory(Config configInstance, AmazonInfoProviderFactory amazonInfoProviderFactory) {
        this.configInstance = configInstance;
        this.amazonInfoProvider = amazonInfoProviderFactory.get();
    }

    @Override
    public EurekaInstanceConfig get() {
        if (eurekaInstanceConfig == null) {
            eurekaInstanceConfig = new Ec2EurekaArchaius2InstanceConfig(configInstance, amazonInfoProvider);
        }

        return eurekaInstanceConfig;
    }
}

<|edits_diff|>
--- eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java
+++ eureka-client-archaius2/src/main/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java
@@ -4,6 +4,7 @@
 import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.archaius.api.Config;
+import com.netflix.discovery.DiscoveryManager;

 import javax.inject.Inject;
 import javax.inject.Provider;
<|current_version|>
package com.netflix.appinfo.providers;

import com.netflix.appinfo.AmazonInfo;
import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.archaius.api.Config;
import com.netflix.discovery.DiscoveryManager;

import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;

@Singleton
public class CustomAmazonInfoProviderInstanceConfigFactory implements EurekaInstanceConfigFactory {

    private final Config configInstance;
    private final Provider<AmazonInfo> amazonInfoProvider;
    private EurekaInstanceConfig eurekaInstanceConfig;

    @Inject
    public CustomAmazonInfoProviderInstanceConfigFactory(Config configInstance, AmazonInfoProviderFactory amazonInfoProviderFactory) {
        this.configInstance = configInstance;
        this.amazonInfoProvider = amazonInfoProviderFactory.get();
    }

    @Override
    public EurekaInstanceConfig get() {
        if (eurekaInstanceConfig == null) {
            eurekaInstanceConfig = new Ec2EurekaArchaius2InstanceConfig(configInstance, amazonInfoProvider);
        }

        return eurekaInstanceConfig;
    }
}

<|next_version|>
package com.netflix.appinfo.providers;

import com.netflix.appinfo.AmazonInfo;
import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.archaius.api.Config;
import com.netflix.discovery.DiscoveryManager;

import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;

@Singleton
public class CustomAmazonInfoProviderInstanceConfigFactory implements EurekaInstanceConfigFactory {

    private final Config configInstance;
    private final Provider<AmazonInfo> amazonInfoProvider;
    private EurekaInstanceConfig eurekaInstanceConfig;

    @Inject
    public CustomAmazonInfoProviderInstanceConfigFactory(Config configInstance, AmazonInfoProviderFactory amazonInfoProviderFactory) {
        this.configInstance = configInstance;
        this.amazonInfoProvider = amazonInfoProviderFactory.get();
    }

    @Override
    public EurekaInstanceConfig get() {
        if (eurekaInstanceConfig == null) {
            eurekaInstanceConfig = new Ec2EurekaArchaius2InstanceConfig(configInstance, amazonInfoProvider);

            // Copied from CompositeInstanceConfigFactory.get
            DiscoveryManager.getInstance().setEurekaInstanceConfig(eurekaInstanceConfig);
        }

        return eurekaInstanceConfig;
    }
}


Add annotations to begin logging to console

--- src/main/java/com/restfiddle/config/monitoring/MetricsConfig.java
+++ src/main/java/com/restfiddle/config/monitoring/MetricsConfig.java
@@ -2,13 +2,17 @@

 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricRegistry;
+import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
 import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
+import org.springframework.context.annotation.Configuration;

 import java.util.concurrent.TimeUnit;

 /**
  * Created by santoshm1 on 28/06/14.
  */
+@Configuration
+@EnableMetrics
 public class MetricsConfig extends MetricsConfigurerAdapter{
     @Override
     public void configureReporters(MetricRegistry metricRegistry) {

<|original_code|>
package com.restfiddle.config.monitoring;

import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.MetricRegistry;
import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;

import java.util.concurrent.TimeUnit;

/**
 * Created by santoshm1 on 28/06/14.
 */
public class MetricsConfig extends MetricsConfigurerAdapter{
    @Override
    public void configureReporters(MetricRegistry metricRegistry) {
	ConsoleReporter
			.forRegistry(metricRegistry)
			.build()
			.start(1, TimeUnit.MINUTES);
    }
}

<|edits_diff|>
--- src/main/java/com/restfiddle/config/monitoring/MetricsConfig.java
+++ src/main/java/com/restfiddle/config/monitoring/MetricsConfig.java
@@ -2,7 +2,9 @@

 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricRegistry;
+import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
 import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
+import org.springframework.context.annotation.Configuration;

 import java.util.concurrent.TimeUnit;

<|current_version|>
package com.restfiddle.config.monitoring;

import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.MetricRegistry;
import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
import org.springframework.context.annotation.Configuration;

import java.util.concurrent.TimeUnit;

/**
 * Created by santoshm1 on 28/06/14.
 */
public class MetricsConfig extends MetricsConfigurerAdapter{
    @Override
    public void configureReporters(MetricRegistry metricRegistry) {
	ConsoleReporter
			.forRegistry(metricRegistry)
			.build()
			.start(1, TimeUnit.MINUTES);
    }
}

<|next_version|>
package com.restfiddle.config.monitoring;

import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.MetricRegistry;
import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
import org.springframework.context.annotation.Configuration;

import java.util.concurrent.TimeUnit;

/**
 * Created by santoshm1 on 28/06/14.
 */
@Configuration
@EnableMetrics
public class MetricsConfig extends MetricsConfigurerAdapter{
    @Override
    public void configureReporters(MetricRegistry metricRegistry) {
	ConsoleReporter
			.forRegistry(metricRegistry)
			.build()
			.start(1, TimeUnit.MINUTES);
    }
}


Add recipe for tracking block.

Add recipe for tracking block.

--- src/main/java/com/micky2506/udaldordecor/block/ModBlocks.java
+++ src/main/java/com/micky2506/udaldordecor/block/ModBlocks.java
@@ -3,6 +3,7 @@
 import com.micky2506.udaldordecor.lib.Names;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;

 public class ModBlocks
@@ -16,5 +17,6 @@
         GameRegistry.registerBlock(displayCase, ItemBlockDisplayCase.class, Names.displayCase);

         GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 0), "ggg", "gig", "ggg", 'i', Blocks.glass_pane, 'g', Blocks.glass);
+        GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 1), "gsg", "gig", "gsg", 'i', Blocks.glass_pane, 'g', Blocks.glass, 's', Items.string);
     }
 }

<|original_code|>
package com.micky2506.udaldordecor.block;

import com.micky2506.udaldordecor.lib.Names;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;

public class ModBlocks
{
    public static BlockDisplayCase displayCase;

    public static void init()
    {
        displayCase = new BlockDisplayCase();

        GameRegistry.registerBlock(displayCase, ItemBlockDisplayCase.class, Names.displayCase);

        GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 0), "ggg", "gig", "ggg", 'i', Blocks.glass_pane, 'g', Blocks.glass);
    }
}
<|edits_diff|>
--- src/main/java/com/micky2506/udaldordecor/block/ModBlocks.java
+++ src/main/java/com/micky2506/udaldordecor/block/ModBlocks.java
@@ -3,6 +3,7 @@
 import com.micky2506.udaldordecor.lib.Names;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;

 public class ModBlocks
<|current_version|>
package com.micky2506.udaldordecor.block;

import com.micky2506.udaldordecor.lib.Names;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;

public class ModBlocks
{
    public static BlockDisplayCase displayCase;

    public static void init()
    {
        displayCase = new BlockDisplayCase();

        GameRegistry.registerBlock(displayCase, ItemBlockDisplayCase.class, Names.displayCase);

        GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 0), "ggg", "gig", "ggg", 'i', Blocks.glass_pane, 'g', Blocks.glass);
    }
}
<|next_version|>
package com.micky2506.udaldordecor.block;

import com.micky2506.udaldordecor.lib.Names;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;

public class ModBlocks
{
    public static BlockDisplayCase displayCase;

    public static void init()
    {
        displayCase = new BlockDisplayCase();

        GameRegistry.registerBlock(displayCase, ItemBlockDisplayCase.class, Names.displayCase);

        GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 0), "ggg", "gig", "ggg", 'i', Blocks.glass_pane, 'g', Blocks.glass);
        GameRegistry.addShapedRecipe(new ItemStack(displayCase, 1, 1), "gsg", "gig", "gsg", 'i', Blocks.glass_pane, 'g', Blocks.glass, 's', Items.string);
    }
}


Add @DoNotInstrument to Flac extension test

PiperOrigin-RevId: 370739641

--- extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
+++ extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
@@ -20,9 +20,11 @@
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;

 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
 @RunWith(AndroidJUnit4.class)
+@DoNotInstrument
 public final class DefaultRenderersFactoryTest {

   @Test

<|original_code|>
/*
 * Copyright (C) 2019 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.google.android.exoplayer2.ext.flac;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test;
import org.junit.runner.RunWith;

/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
@RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest {

  @Test
  public void createRenderers_instantiatesFlacRenderer() {
    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
        LibflacAudioRenderer.class, C.TRACK_TYPE_AUDIO);
  }
}

<|edits_diff|>
--- extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
+++ extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
@@ -20,6 +20,7 @@
 import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.internal.DoNotInstrument;

 /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
 @RunWith(AndroidJUnit4.class)
<|current_version|>
/*
 * Copyright (C) 2019 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.google.android.exoplayer2.ext.flac;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.internal.DoNotInstrument;

/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
@RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest {

  @Test
  public void createRenderers_instantiatesFlacRenderer() {
    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
        LibflacAudioRenderer.class, C.TRACK_TYPE_AUDIO);
  }
}

<|next_version|>
/*
 * Copyright (C) 2019 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.google.android.exoplayer2.ext.flac;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.internal.DoNotInstrument;

/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
@RunWith(AndroidJUnit4.class)
@DoNotInstrument
public final class DefaultRenderersFactoryTest {

  @Test
  public void createRenderers_instantiatesFlacRenderer() {
    DefaultRenderersFactoryAsserts.assertExtensionRendererCreated(
        LibflacAudioRenderer.class, C.TRACK_TYPE_AUDIO);
  }
}


Check that circle ci catches failures.

Check that circle ci catches failures.

--- src/test/java/com/realkinetic/app/gabby/repository/downstream/memory/MemoryDownstreamTest.java
+++ src/test/java/com/realkinetic/app/gabby/repository/downstream/memory/MemoryDownstreamTest.java
@@ -5,6 +5,8 @@
 import com.realkinetic.app.gabby.config.MemoryConfig;
 import com.realkinetic.app.gabby.repository.BaseDownstream;
 import com.realkinetic.app.gabby.repository.DownstreamSubscription;
+import org.junit.Assert;
+import org.junit.Test;

 import java.util.logging.Logger;

@@ -25,4 +27,9 @@
     protected void createTopic(String topic) {
         // just like redis, this simply doesn't matter
     }
+
+    @Test
+    public void testFail() {
+        Assert.fail();
+    }
 }

<|original_code|>
package com.realkinetic.app.gabby.repository.downstream.memory;

import com.realkinetic.app.gabby.config.BaseConfig;
import com.realkinetic.app.gabby.config.DefaultConfig;
import com.realkinetic.app.gabby.config.MemoryConfig;
import com.realkinetic.app.gabby.repository.BaseDownstream;
import com.realkinetic.app.gabby.repository.DownstreamSubscription;

import java.util.logging.Logger;

public class MemoryDownstreamTest extends BaseDownstream {
    private static final Logger LOG = Logger.getLogger(MemoryDownstreamTest.class.getName());

    @Override
    protected DownstreamSubscription getDownstream() {
        final BaseConfig config = (BaseConfig) DefaultConfig.load();
        config.setDownstreamTimeout(1);
        final MemoryConfig memoryConfig = new MemoryConfig();
        memoryConfig.setMaxAccesses(10);
        config.setMemoryConfig(memoryConfig);
        return new MemoryDownstream(config, mm -> true);
    }

    @Override
    protected void createTopic(String topic) {
        // just like redis, this simply doesn't matter
    }
}

<|edits_diff|>
--- src/test/java/com/realkinetic/app/gabby/repository/downstream/memory/MemoryDownstreamTest.java
+++ src/test/java/com/realkinetic/app/gabby/repository/downstream/memory/MemoryDownstreamTest.java
@@ -5,6 +5,8 @@
 import com.realkinetic.app.gabby.config.MemoryConfig;
 import com.realkinetic.app.gabby.repository.BaseDownstream;
 import com.realkinetic.app.gabby.repository.DownstreamSubscription;
+import org.junit.Assert;
+import org.junit.Test;

 import java.util.logging.Logger;

<|current_version|>
package com.realkinetic.app.gabby.repository.downstream.memory;

import com.realkinetic.app.gabby.config.BaseConfig;
import com.realkinetic.app.gabby.config.DefaultConfig;
import com.realkinetic.app.gabby.config.MemoryConfig;
import com.realkinetic.app.gabby.repository.BaseDownstream;
import com.realkinetic.app.gabby.repository.DownstreamSubscription;
import org.junit.Assert;
import org.junit.Test;

import java.util.logging.Logger;

public class MemoryDownstreamTest extends BaseDownstream {
    private static final Logger LOG = Logger.getLogger(MemoryDownstreamTest.class.getName());

    @Override
    protected DownstreamSubscription getDownstream() {
        final BaseConfig config = (BaseConfig) DefaultConfig.load();
        config.setDownstreamTimeout(1);
        final MemoryConfig memoryConfig = new MemoryConfig();
        memoryConfig.setMaxAccesses(10);
        config.setMemoryConfig(memoryConfig);
        return new MemoryDownstream(config, mm -> true);
    }

    @Override
    protected void createTopic(String topic) {
        // just like redis, this simply doesn't matter
    }
}

<|next_version|>
package com.realkinetic.app.gabby.repository.downstream.memory;

import com.realkinetic.app.gabby.config.BaseConfig;
import com.realkinetic.app.gabby.config.DefaultConfig;
import com.realkinetic.app.gabby.config.MemoryConfig;
import com.realkinetic.app.gabby.repository.BaseDownstream;
import com.realkinetic.app.gabby.repository.DownstreamSubscription;
import org.junit.Assert;
import org.junit.Test;

import java.util.logging.Logger;

public class MemoryDownstreamTest extends BaseDownstream {
    private static final Logger LOG = Logger.getLogger(MemoryDownstreamTest.class.getName());

    @Override
    protected DownstreamSubscription getDownstream() {
        final BaseConfig config = (BaseConfig) DefaultConfig.load();
        config.setDownstreamTimeout(1);
        final MemoryConfig memoryConfig = new MemoryConfig();
        memoryConfig.setMaxAccesses(10);
        config.setMemoryConfig(memoryConfig);
        return new MemoryDownstream(config, mm -> true);
    }

    @Override
    protected void createTopic(String topic) {
        // just like redis, this simply doesn't matter
    }

    @Test
    public void testFail() {
        Assert.fail();
    }
}


Mark cache-control DSL entry point as @Experimental

--- subprojects/core/src/main/groovy/org/gradle/api/artifacts/cache/ResolutionRules.java
+++ subprojects/core/src/main/groovy/org/gradle/api/artifacts/cache/ResolutionRules.java
@@ -16,11 +16,13 @@
 package org.gradle.api.artifacts.cache;

 import org.gradle.api.Action;
+import org.gradle.api.Experimental;

 /**
  * Represents a set of rules/actions that can be applied during dependency resolution.
  * Currently these are restricted to controlling caching, but these could possibly be extended in the future to include other manipulations.
  */
+@Experimental
 public interface ResolutionRules {
     /**
      * Apply a rule to control resolution of dependencies.

<|original_code|>
/*
 * Copyright 2011 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.gradle.api.artifacts.cache;

import org.gradle.api.Action;

/**
 * Represents a set of rules/actions that can be applied during dependency resolution.
 * Currently these are restricted to controlling caching, but these could possibly be extended in the future to include other manipulations.
 */
public interface ResolutionRules {
    /**
     * Apply a rule to control resolution of dependencies.
     * @param rule the rule to apply
     */
    void eachDependency(Action<? super DependencyResolutionControl> rule);

    /**
     * Apply a rule to control resolution of modules.
     * @param rule the rule to apply
     */
    void eachModule(Action<? super ModuleResolutionControl> rule);

    /**
     * Apply a rule to control resolution of artifacts.
     * @param rule the rule to apply
     */
    void eachArtifact(Action<? super ArtifactResolutionControl> rule);
}

<|edits_diff|>
--- subprojects/core/src/main/groovy/org/gradle/api/artifacts/cache/ResolutionRules.java
+++ subprojects/core/src/main/groovy/org/gradle/api/artifacts/cache/ResolutionRules.java
@@ -16,6 +16,7 @@
 package org.gradle.api.artifacts.cache;

 import org.gradle.api.Action;
+import org.gradle.api.Experimental;

 /**
  * Represents a set of rules/actions that can be applied during dependency resolution.
<|current_version|>
/*
 * Copyright 2011 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.gradle.api.artifacts.cache;

import org.gradle.api.Action;
import org.gradle.api.Experimental;

/**
 * Represents a set of rules/actions that can be applied during dependency resolution.
 * Currently these are restricted to controlling caching, but these could possibly be extended in the future to include other manipulations.
 */
public interface ResolutionRules {
    /**
     * Apply a rule to control resolution of dependencies.
     * @param rule the rule to apply
     */
    void eachDependency(Action<? super DependencyResolutionControl> rule);

    /**
     * Apply a rule to control resolution of modules.
     * @param rule the rule to apply
     */
    void eachModule(Action<? super ModuleResolutionControl> rule);

    /**
     * Apply a rule to control resolution of artifacts.
     * @param rule the rule to apply
     */
    void eachArtifact(Action<? super ArtifactResolutionControl> rule);
}

<|next_version|>
/*
 * Copyright 2011 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.gradle.api.artifacts.cache;

import org.gradle.api.Action;
import org.gradle.api.Experimental;

/**
 * Represents a set of rules/actions that can be applied during dependency resolution.
 * Currently these are restricted to controlling caching, but these could possibly be extended in the future to include other manipulations.
 */
@Experimental
public interface ResolutionRules {
    /**
     * Apply a rule to control resolution of dependencies.
     * @param rule the rule to apply
     */
    void eachDependency(Action<? super DependencyResolutionControl> rule);

    /**
     * Apply a rule to control resolution of modules.
     * @param rule the rule to apply
     */
    void eachModule(Action<? super ModuleResolutionControl> rule);

    /**
     * Apply a rule to control resolution of artifacts.
     * @param rule the rule to apply
     */
    void eachArtifact(Action<? super ArtifactResolutionControl> rule);
}


Fix config not reloading by reload command

--- src/main/java/me/rafaskb/ticketmaster/commands/CommandReload.java
+++ src/main/java/me/rafaskb/ticketmaster/commands/CommandReload.java
@@ -1,5 +1,6 @@
 package me.rafaskb.ticketmaster.commands;

+import me.rafaskb.ticketmaster.utils.ConfigLoader;
 import org.bukkit.command.CommandSender;

 import me.rafaskb.ticketmaster.utils.Lang;
@@ -15,6 +16,7 @@
 	@Override
 	protected void run(CommandSender sender, String[] args) {
 		LangConfig.reloadConfig();
+		ConfigLoader.reloadConfig();
 		Lang.sendMessage(sender, Lang.RELOAD_MESSAGE);
 	}

<|original_code|>
package me.rafaskb.ticketmaster.commands;

import org.bukkit.command.CommandSender;

import me.rafaskb.ticketmaster.utils.Lang;
import me.rafaskb.ticketmaster.utils.LangConfig;
import me.rafaskb.ticketmaster.utils.Perm;

public class CommandReload extends Command {

	public CommandReload() {
		super(Perm.RELOAD);
	}

	@Override
	protected void run(CommandSender sender, String[] args) {
		LangConfig.reloadConfig();
		Lang.sendMessage(sender, Lang.RELOAD_MESSAGE);
	}

}

<|edits_diff|>
--- src/main/java/me/rafaskb/ticketmaster/commands/CommandReload.java
+++ src/main/java/me/rafaskb/ticketmaster/commands/CommandReload.java
@@ -1,5 +1,6 @@
 package me.rafaskb.ticketmaster.commands;

+import me.rafaskb.ticketmaster.utils.ConfigLoader;
 import org.bukkit.command.CommandSender;

 import me.rafaskb.ticketmaster.utils.Lang;
<|current_version|>
package me.rafaskb.ticketmaster.commands;

import me.rafaskb.ticketmaster.utils.ConfigLoader;
import org.bukkit.command.CommandSender;

import me.rafaskb.ticketmaster.utils.Lang;
import me.rafaskb.ticketmaster.utils.LangConfig;
import me.rafaskb.ticketmaster.utils.Perm;

public class CommandReload extends Command {

	public CommandReload() {
		super(Perm.RELOAD);
	}

	@Override
	protected void run(CommandSender sender, String[] args) {
		LangConfig.reloadConfig();
		Lang.sendMessage(sender, Lang.RELOAD_MESSAGE);
	}

}

<|next_version|>
package me.rafaskb.ticketmaster.commands;

import me.rafaskb.ticketmaster.utils.ConfigLoader;
import org.bukkit.command.CommandSender;

import me.rafaskb.ticketmaster.utils.Lang;
import me.rafaskb.ticketmaster.utils.LangConfig;
import me.rafaskb.ticketmaster.utils.Perm;

public class CommandReload extends Command {

	public CommandReload() {
		super(Perm.RELOAD);
	}

	@Override
	protected void run(CommandSender sender, String[] args) {
		LangConfig.reloadConfig();
		ConfigLoader.reloadConfig();
		Lang.sendMessage(sender, Lang.RELOAD_MESSAGE);
	}

}


Rename sendTileEntityUpdatePacket to something more fitting

--- src/main/java/ivorius/ivtoolkit/network/IvNetworkHelperClient.java
+++ src/main/java/ivorius/ivtoolkit/network/IvNetworkHelperClient.java
@@ -24,7 +24,13 @@
  */
 public class IvNetworkHelperClient
 {
+    @Deprecated
     public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityUpdatePacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
+    {
+        sendTileEntityEventPacket(tileEntity, context, network, params);
+    }
+
+    public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityEventPacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
     {
         if (!(tileEntity.getWorldObj().isRemote))
             throw new UnsupportedOperationException();

<|original_code|>
/*
 * Copyright 2014 Lukas Tenbrink
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *        http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */

package ivorius.ivtoolkit.network;

import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraft.tileentity.TileEntity;

/**
 * Created by lukas on 25.09.14.
 */
public class IvNetworkHelperClient
{
    public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityUpdatePacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
    {
        if (!(tileEntity.getWorldObj().isRemote))
            throw new UnsupportedOperationException();

        network.sendToServer(PacketTileEntityClientEvent.packetEntityData(tileEntity, context, params));
    }
}

<|edits_diff|>
--- src/main/java/ivorius/ivtoolkit/network/IvNetworkHelperClient.java
+++ src/main/java/ivorius/ivtoolkit/network/IvNetworkHelperClient.java
@@ -24,6 +24,7 @@
  */
 public class IvNetworkHelperClient
 {
+    @Deprecated
     public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityUpdatePacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
     {
         if (!(tileEntity.getWorldObj().isRemote))
<|current_version|>
/*
 * Copyright 2014 Lukas Tenbrink
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *        http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */

package ivorius.ivtoolkit.network;

import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraft.tileentity.TileEntity;

/**
 * Created by lukas on 25.09.14.
 */
public class IvNetworkHelperClient
{
    @Deprecated
    public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityUpdatePacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
    {
        if (!(tileEntity.getWorldObj().isRemote))
            throw new UnsupportedOperationException();

        network.sendToServer(PacketTileEntityClientEvent.packetEntityData(tileEntity, context, params));
    }
}

<|next_version|>
/*
 * Copyright 2014 Lukas Tenbrink
 *
 *    Licensed under the Apache License, Version 2.0 (the "License");
 *    you may not use this file except in compliance with the License.
 *    You may obtain a copy of the License at
 *
 *        http://www.apache.org/licenses/LICENSE-2.0
 *
 *    Unless required by applicable law or agreed to in writing, software
 *    distributed under the License is distributed on an "AS IS" BASIS,
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *    See the License for the specific language governing permissions and
 *    limitations under the License.
 */

package ivorius.ivtoolkit.network;

import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraft.tileentity.TileEntity;

/**
 * Created by lukas on 25.09.14.
 */
public class IvNetworkHelperClient
{
    @Deprecated
    public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityUpdatePacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
    {
        sendTileEntityEventPacket(tileEntity, context, network, params);
    }

    public static <ETileEntity extends TileEntity & ClientEventHandler> void sendTileEntityEventPacket(ETileEntity tileEntity, String context, SimpleNetworkWrapper network, Object... params)
    {
        if (!(tileEntity.getWorldObj().isRemote))
            throw new UnsupportedOperationException();

        network.sendToServer(PacketTileEntityClientEvent.packetEntityData(tileEntity, context, params));
    }
}


Add ability to return a list of credentials based on status (DEV-99)

--- service-authentication/src/main/java/sg/ncl/service/authentication/data/jpa/repositories/CredentialsRepository.java
+++ service-authentication/src/main/java/sg/ncl/service/authentication/data/jpa/repositories/CredentialsRepository.java
@@ -2,6 +2,9 @@

 import org.springframework.data.jpa.repository.JpaRepository;
 import sg.ncl.service.authentication.data.jpa.entities.CredentialsEntity;
+import sg.ncl.service.authentication.domain.CredentialsStatus;
+
+import java.util.List;

 /**
  * @author Christopher Zhong
@@ -12,4 +15,6 @@

     CredentialsEntity findByUserId(String userId);

+    List<CredentialsEntity> findByStatus(CredentialsStatus status);
+
 }

<|original_code|>
package sg.ncl.service.authentication.data.jpa.repositories;

import org.springframework.data.jpa.repository.JpaRepository;
import sg.ncl.service.authentication.data.jpa.entities.CredentialsEntity;

/**
 * @author Christopher Zhong
 */
public interface CredentialsRepository extends JpaRepository<CredentialsEntity, Long> {

    CredentialsEntity findByUsername(String username);

    CredentialsEntity findByUserId(String userId);

}

<|edits_diff|>
--- service-authentication/src/main/java/sg/ncl/service/authentication/data/jpa/repositories/CredentialsRepository.java
+++ service-authentication/src/main/java/sg/ncl/service/authentication/data/jpa/repositories/CredentialsRepository.java
@@ -2,6 +2,9 @@

 import org.springframework.data.jpa.repository.JpaRepository;
 import sg.ncl.service.authentication.data.jpa.entities.CredentialsEntity;
+import sg.ncl.service.authentication.domain.CredentialsStatus;
+
+import java.util.List;

 /**
  * @author Christopher Zhong
<|current_version|>
package sg.ncl.service.authentication.data.jpa.repositories;

import org.springframework.data.jpa.repository.JpaRepository;
import sg.ncl.service.authentication.data.jpa.entities.CredentialsEntity;
import sg.ncl.service.authentication.domain.CredentialsStatus;

import java.util.List;

/**
 * @author Christopher Zhong
 */
public interface CredentialsRepository extends JpaRepository<CredentialsEntity, Long> {

    CredentialsEntity findByUsername(String username);

    CredentialsEntity findByUserId(String userId);

}

<|next_version|>
package sg.ncl.service.authentication.data.jpa.repositories;

import org.springframework.data.jpa.repository.JpaRepository;
import sg.ncl.service.authentication.data.jpa.entities.CredentialsEntity;
import sg.ncl.service.authentication.domain.CredentialsStatus;

import java.util.List;

/**
 * @author Christopher Zhong
 */
public interface CredentialsRepository extends JpaRepository<CredentialsEntity, Long> {

    CredentialsEntity findByUsername(String username);

    CredentialsEntity findByUserId(String userId);

    List<CredentialsEntity> findByStatus(CredentialsStatus status);

}


Disable one more graph test

Disable one more graph test

--- azure-mgmt-graph-rbac/src/test/java/com/microsoft/azure/management/graphrbac/ServicePrincipalsTests.java
+++ azure-mgmt-graph-rbac/src/test/java/com/microsoft/azure/management/graphrbac/ServicePrincipalsTests.java
@@ -9,6 +9,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;

 import java.util.List;
@@ -27,6 +28,7 @@
     }

     @Test
+    @Ignore("Doesn't work when logged as a service principal")
     public void getServicePrincipal() throws Exception {
         List<ServicePrincipal> servicePrincipals = graphRbacManager.servicePrincipals().list();
         Assert.assertNotNull(servicePrincipals);

<|original_code|>
/**
 * Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the MIT License. See License.txt in the project root for
 * license information.
 */

package com.microsoft.azure.management.graphrbac;

import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.util.List;

public class ServicePrincipalsTests extends GraphRbacManagementTestBase {
    private static final String RG_NAME = "javacsmrg350";
    private static final String APP_NAME = "app-javacsm350";

    @BeforeClass
    public static void setup() throws Exception {
        createClients();
    }

    @AfterClass
    public static void cleanup() throws Exception {
    }

    @Test
    public void getServicePrincipal() throws Exception {
        List<ServicePrincipal> servicePrincipals = graphRbacManager.servicePrincipals().list();
        Assert.assertNotNull(servicePrincipals);
    }

}

<|edits_diff|>
--- azure-mgmt-graph-rbac/src/test/java/com/microsoft/azure/management/graphrbac/ServicePrincipalsTests.java
+++ azure-mgmt-graph-rbac/src/test/java/com/microsoft/azure/management/graphrbac/ServicePrincipalsTests.java
@@ -9,6 +9,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;

 import java.util.List;
<|current_version|>
/**
 * Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the MIT License. See License.txt in the project root for
 * license information.
 */

package com.microsoft.azure.management.graphrbac;

import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;

import java.util.List;

public class ServicePrincipalsTests extends GraphRbacManagementTestBase {
    private static final String RG_NAME = "javacsmrg350";
    private static final String APP_NAME = "app-javacsm350";

    @BeforeClass
    public static void setup() throws Exception {
        createClients();
    }

    @AfterClass
    public static void cleanup() throws Exception {
    }

    @Test
    public void getServicePrincipal() throws Exception {
        List<ServicePrincipal> servicePrincipals = graphRbacManager.servicePrincipals().list();
        Assert.assertNotNull(servicePrincipals);
    }

}

<|next_version|>
/**
 * Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the MIT License. See License.txt in the project root for
 * license information.
 */

package com.microsoft.azure.management.graphrbac;

import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;

import java.util.List;

public class ServicePrincipalsTests extends GraphRbacManagementTestBase {
    private static final String RG_NAME = "javacsmrg350";
    private static final String APP_NAME = "app-javacsm350";

    @BeforeClass
    public static void setup() throws Exception {
        createClients();
    }

    @AfterClass
    public static void cleanup() throws Exception {
    }

    @Test
    @Ignore("Doesn't work when logged as a service principal")
    public void getServicePrincipal() throws Exception {
        List<ServicePrincipal> servicePrincipals = graphRbacManager.servicePrincipals().list();
        Assert.assertNotNull(servicePrincipals);
    }

}