Include a timestamp of when the data was requested from wunderground (roughly)

--- src/main/java/com/wwsean08/WeatherReport/pojo/RabbitMQJson.java
+++ src/main/java/com/wwsean08/WeatherReport/pojo/RabbitMQJson.java
@@ -1,6 +1,7 @@
 package com.wwsean08.WeatherReport.pojo;

 import com.google.gson.annotations.SerializedName;
+import com.sun.glass.ui.SystemClipboard;

 /**
  * Created by wwsea_000 on 12/30/2015.
@@ -13,6 +14,8 @@
     private float temp;
     @SerializedName("icon")
     private String icon;
+    @SerializedName("timestamp")
+    private long timestamp = System.currentTimeMillis();

     public String getLocation()
     {

<|original_code|>
package com.wwsean08.WeatherReport.pojo;

import com.google.gson.annotations.SerializedName;

/**
 * Created by wwsea_000 on 12/30/2015.
 */
public class RabbitMQJson
{
    @SerializedName("location")
    private String location;
    @SerializedName("temperature")
    private float temp;
    @SerializedName("icon")
    private String icon;

    public String getLocation()
    {
        return location;
    }

    public void setLocation(String location)
    {
        this.location = location;
    }

    public float getTemp()
    {
        return temp;
    }

    public void setTemp(float temp)
    {
        this.temp = temp;
    }

    public String getIcon()
    {
        return icon;
    }

    public void setIcon(String icon)
    {
        this.icon = icon;
    }
}

<|edits_diff|>
--- src/main/java/com/wwsean08/WeatherReport/pojo/RabbitMQJson.java
+++ src/main/java/com/wwsean08/WeatherReport/pojo/RabbitMQJson.java
@@ -1,6 +1,7 @@
 package com.wwsean08.WeatherReport.pojo;

 import com.google.gson.annotations.SerializedName;
+import com.sun.glass.ui.SystemClipboard;

 /**
  * Created by wwsea_000 on 12/30/2015.
<|current_version|>
package com.wwsean08.WeatherReport.pojo;

import com.google.gson.annotations.SerializedName;
import com.sun.glass.ui.SystemClipboard;

/**
 * Created by wwsea_000 on 12/30/2015.
 */
public class RabbitMQJson
{
    @SerializedName("location")
    private String location;
    @SerializedName("temperature")
    private float temp;
    @SerializedName("icon")
    private String icon;

    public String getLocation()
    {
        return location;
    }

    public void setLocation(String location)
    {
        this.location = location;
    }

    public float getTemp()
    {
        return temp;
    }

    public void setTemp(float temp)
    {
        this.temp = temp;
    }

    public String getIcon()
    {
        return icon;
    }

    public void setIcon(String icon)
    {
        this.icon = icon;
    }
}

<|next_version|>
package com.wwsean08.WeatherReport.pojo;

import com.google.gson.annotations.SerializedName;
import com.sun.glass.ui.SystemClipboard;

/**
 * Created by wwsea_000 on 12/30/2015.
 */
public class RabbitMQJson
{
    @SerializedName("location")
    private String location;
    @SerializedName("temperature")
    private float temp;
    @SerializedName("icon")
    private String icon;
    @SerializedName("timestamp")
    private long timestamp = System.currentTimeMillis();

    public String getLocation()
    {
        return location;
    }

    public void setLocation(String location)
    {
        this.location = location;
    }

    public float getTemp()
    {
        return temp;
    }

    public void setTemp(float temp)
    {
        this.temp = temp;
    }

    public String getIcon()
    {
        return icon;
    }

    public void setIcon(String icon)
    {
        this.icon = icon;
    }
}


Change the background color for an example.

--- MarkdownViewDemo/src/us/feras/mdv/demo/MarkdownDataActivity.java
+++ MarkdownViewDemo/src/us/feras/mdv/demo/MarkdownDataActivity.java
@@ -2,6 +2,7 @@

 import us.feras.mdv.MarkdownView;
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -21,6 +22,7 @@
 		markdownView = (MarkdownView) findViewById(R.id.markdownView);
 		String text = "## This is a demo of MarkdownView" + "\n" + "* * *" + "\n" + "### Edit the text and hit update to see the changes on the view.";
 		markdownEditText.setText(text);
+		markdownView.setBackgroundColor(Color.parseColor("#EED8AE"));
 		updateMarkdownView();

 		Button updateView = (Button) findViewById(R.id.updateButton);

<|original_code|>
package us.feras.mdv.demo;

import us.feras.mdv.MarkdownView;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;

public class MarkdownDataActivity extends Activity {

	EditText markdownEditText;
	MarkdownView markdownView;

	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.markdown_view);
		markdownEditText = (EditText) findViewById(R.id.markdownText);
		markdownView = (MarkdownView) findViewById(R.id.markdownView);
		String text = "## This is a demo of MarkdownView" + "\n" + "* * *" + "\n" + "### Edit the text and hit update to see the changes on the view.";
		markdownEditText.setText(text);
		updateMarkdownView();

		Button updateView = (Button) findViewById(R.id.updateButton);
		updateView.setOnClickListener(new OnClickListener() {
			@Override
			public void onClick(View v) {
				updateMarkdownView();
			}
		});

	}

	void updateMarkdownView() {
		markdownView.loadMarkDownData(markdownEditText.getText().toString());
	}
}
<|edits_diff|>
--- MarkdownViewDemo/src/us/feras/mdv/demo/MarkdownDataActivity.java
+++ MarkdownViewDemo/src/us/feras/mdv/demo/MarkdownDataActivity.java
@@ -2,6 +2,7 @@

 import us.feras.mdv.MarkdownView;
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
<|current_version|>
package us.feras.mdv.demo;

import us.feras.mdv.MarkdownView;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;

public class MarkdownDataActivity extends Activity {

	EditText markdownEditText;
	MarkdownView markdownView;

	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.markdown_view);
		markdownEditText = (EditText) findViewById(R.id.markdownText);
		markdownView = (MarkdownView) findViewById(R.id.markdownView);
		String text = "## This is a demo of MarkdownView" + "\n" + "* * *" + "\n" + "### Edit the text and hit update to see the changes on the view.";
		markdownEditText.setText(text);
		updateMarkdownView();

		Button updateView = (Button) findViewById(R.id.updateButton);
		updateView.setOnClickListener(new OnClickListener() {
			@Override
			public void onClick(View v) {
				updateMarkdownView();
			}
		});

	}

	void updateMarkdownView() {
		markdownView.loadMarkDownData(markdownEditText.getText().toString());
	}
}
<|next_version|>
package us.feras.mdv.demo;

import us.feras.mdv.MarkdownView;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;

public class MarkdownDataActivity extends Activity {

	EditText markdownEditText;
	MarkdownView markdownView;

	@Override
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.markdown_view);
		markdownEditText = (EditText) findViewById(R.id.markdownText);
		markdownView = (MarkdownView) findViewById(R.id.markdownView);
		String text = "## This is a demo of MarkdownView" + "\n" + "* * *" + "\n" + "### Edit the text and hit update to see the changes on the view.";
		markdownEditText.setText(text);
		markdownView.setBackgroundColor(Color.parseColor("#EED8AE"));
		updateMarkdownView();

		Button updateView = (Button) findViewById(R.id.updateButton);
		updateView.setOnClickListener(new OnClickListener() {
			@Override
			public void onClick(View v) {
				updateMarkdownView();
			}
		});

	}

	void updateMarkdownView() {
		markdownView.loadMarkDownData(markdownEditText.getText().toString());
	}
}


Add documentation for public class and method

--- tools/src/main/java/com/janosgyerik/tools/util/MatrixUtils.java
+++ tools/src/main/java/com/janosgyerik/tools/util/MatrixUtils.java
@@ -2,12 +2,20 @@

 import java.util.Arrays;

+/**
+ * Utility class to work with matrices
+ */
 public class MatrixUtils {

     private MatrixUtils() {
         // utility class, forbidden constructor
     }

+    /**
+     * Format matrix as String, by joining Arrays.toString of each row
+     * @param matrix the matrix to format
+     * @return the matrix String
+     */
     public static String toString(int[][] matrix) {
         StringBuilder builder = new StringBuilder();
         builder.append("[");

<|original_code|>
package com.janosgyerik.tools.util;

import java.util.Arrays;

public class MatrixUtils {

    private MatrixUtils() {
        // utility class, forbidden constructor
    }

    public static String toString(int[][] matrix) {
        StringBuilder builder = new StringBuilder();
        builder.append("[");
        if (matrix.length > 0) {
            builder.append(Arrays.toString(matrix[0]));
            for (int i = 1; i < matrix.length; ++i) {
                builder.append(", ").append(Arrays.toString(matrix[i]));
            }
        }
        builder.append("]");
        return builder.toString();
    }
}

<|edits_diff|>
--- tools/src/main/java/com/janosgyerik/tools/util/MatrixUtils.java
+++ tools/src/main/java/com/janosgyerik/tools/util/MatrixUtils.java
@@ -2,6 +2,9 @@

 import java.util.Arrays;

+/**
+ * Utility class to work with matrices
+ */
 public class MatrixUtils {

     private MatrixUtils() {
<|current_version|>
package com.janosgyerik.tools.util;

import java.util.Arrays;

/**
 * Utility class to work with matrices
 */
public class MatrixUtils {

    private MatrixUtils() {
        // utility class, forbidden constructor
    }

    public static String toString(int[][] matrix) {
        StringBuilder builder = new StringBuilder();
        builder.append("[");
        if (matrix.length > 0) {
            builder.append(Arrays.toString(matrix[0]));
            for (int i = 1; i < matrix.length; ++i) {
                builder.append(", ").append(Arrays.toString(matrix[i]));
            }
        }
        builder.append("]");
        return builder.toString();
    }
}

<|next_version|>
package com.janosgyerik.tools.util;

import java.util.Arrays;

/**
 * Utility class to work with matrices
 */
public class MatrixUtils {

    private MatrixUtils() {
        // utility class, forbidden constructor
    }

    /**
     * Format matrix as String, by joining Arrays.toString of each row
     * @param matrix the matrix to format
     * @return the matrix String
     */
    public static String toString(int[][] matrix) {
        StringBuilder builder = new StringBuilder();
        builder.append("[");
        if (matrix.length > 0) {
            builder.append(Arrays.toString(matrix[0]));
            for (int i = 1; i < matrix.length; ++i) {
                builder.append(", ").append(Arrays.toString(matrix[i]));
            }
        }
        builder.append("]");
        return builder.toString();
    }
}


Add endpoint for saving todo

Add endpoint for saving todo

--- src/main/java/net/furikuri/TodoController.java
+++ src/main/java/net/furikuri/TodoController.java
@@ -1,7 +1,9 @@
 package net.furikuri;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

 import java.util.List;
@@ -16,4 +18,9 @@
     public List<Todo> getAll() {
         return repository.findAll();
     }
+
+    @RequestMapping(value = "/", method = RequestMethod.POST)
+    public Todo save(@RequestBody Todo todo) {
+        return repository.save(todo);
+    }
 }

<|original_code|>
package net.furikuri;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
public class TodoController {

    @Autowired
    private TodoRepository repository;

    @RequestMapping("/")
    public List<Todo> getAll() {
        return repository.findAll();
    }
}

<|edits_diff|>
--- src/main/java/net/furikuri/TodoController.java
+++ src/main/java/net/furikuri/TodoController.java
@@ -1,7 +1,9 @@
 package net.furikuri;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

 import java.util.List;
<|current_version|>
package net.furikuri;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
public class TodoController {

    @Autowired
    private TodoRepository repository;

    @RequestMapping("/")
    public List<Todo> getAll() {
        return repository.findAll();
    }
}

<|next_version|>
package net.furikuri;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
public class TodoController {

    @Autowired
    private TodoRepository repository;

    @RequestMapping("/")
    public List<Todo> getAll() {
        return repository.findAll();
    }

    @RequestMapping(value = "/", method = RequestMethod.POST)
    public Todo save(@RequestBody Todo todo) {
        return repository.save(todo);
    }
}


Add SubscriptionManager to gin module

Add SubscriptionManager to gin module

--- src/main/java/org/realityforge/replicant/client/json/gwt/ReplicantGinModule.java
+++ src/main/java/org/realityforge/replicant/client/json/gwt/ReplicantGinModule.java
@@ -5,6 +5,8 @@
 import org.realityforge.replicant.client.EntityChangeBrokerImpl;
 import org.realityforge.replicant.client.EntityRepository;
 import org.realityforge.replicant.client.EntityRepositoryImpl;
+import org.realityforge.replicant.client.EntitySubscriptionManager;
+import org.realityforge.replicant.client.EntitySubscriptionManagerImpl;

 /**
  * A simple GIN module that defines the repository and change broker services.
@@ -17,5 +19,6 @@
   {
     bind( EntityRepository.class ).to( EntityRepositoryImpl.class ).asEagerSingleton();
     bind( EntityChangeBroker.class ).to( EntityChangeBrokerImpl.class ).asEagerSingleton();
+    bind( EntitySubscriptionManager.class ).to( EntitySubscriptionManagerImpl.class ).asEagerSingleton();
   }
 }

<|original_code|>
package org.realityforge.replicant.client.json.gwt;

import com.google.gwt.inject.client.AbstractGinModule;
import org.realityforge.replicant.client.EntityChangeBroker;
import org.realityforge.replicant.client.EntityChangeBrokerImpl;
import org.realityforge.replicant.client.EntityRepository;
import org.realityforge.replicant.client.EntityRepositoryImpl;

/**
 * A simple GIN module that defines the repository and change broker services.
 */
public class ReplicantGinModule
  extends AbstractGinModule
{
  @Override
  protected void configure()
  {
    bind( EntityRepository.class ).to( EntityRepositoryImpl.class ).asEagerSingleton();
    bind( EntityChangeBroker.class ).to( EntityChangeBrokerImpl.class ).asEagerSingleton();
  }
}

<|edits_diff|>
--- src/main/java/org/realityforge/replicant/client/json/gwt/ReplicantGinModule.java
+++ src/main/java/org/realityforge/replicant/client/json/gwt/ReplicantGinModule.java
@@ -5,6 +5,8 @@
 import org.realityforge.replicant.client.EntityChangeBrokerImpl;
 import org.realityforge.replicant.client.EntityRepository;
 import org.realityforge.replicant.client.EntityRepositoryImpl;
+import org.realityforge.replicant.client.EntitySubscriptionManager;
+import org.realityforge.replicant.client.EntitySubscriptionManagerImpl;

 /**
  * A simple GIN module that defines the repository and change broker services.
<|current_version|>
package org.realityforge.replicant.client.json.gwt;

import com.google.gwt.inject.client.AbstractGinModule;
import org.realityforge.replicant.client.EntityChangeBroker;
import org.realityforge.replicant.client.EntityChangeBrokerImpl;
import org.realityforge.replicant.client.EntityRepository;
import org.realityforge.replicant.client.EntityRepositoryImpl;
import org.realityforge.replicant.client.EntitySubscriptionManager;
import org.realityforge.replicant.client.EntitySubscriptionManagerImpl;

/**
 * A simple GIN module that defines the repository and change broker services.
 */
public class ReplicantGinModule
  extends AbstractGinModule
{
  @Override
  protected void configure()
  {
    bind( EntityRepository.class ).to( EntityRepositoryImpl.class ).asEagerSingleton();
    bind( EntityChangeBroker.class ).to( EntityChangeBrokerImpl.class ).asEagerSingleton();
  }
}

<|next_version|>
package org.realityforge.replicant.client.json.gwt;

import com.google.gwt.inject.client.AbstractGinModule;
import org.realityforge.replicant.client.EntityChangeBroker;
import org.realityforge.replicant.client.EntityChangeBrokerImpl;
import org.realityforge.replicant.client.EntityRepository;
import org.realityforge.replicant.client.EntityRepositoryImpl;
import org.realityforge.replicant.client.EntitySubscriptionManager;
import org.realityforge.replicant.client.EntitySubscriptionManagerImpl;

/**
 * A simple GIN module that defines the repository and change broker services.
 */
public class ReplicantGinModule
  extends AbstractGinModule
{
  @Override
  protected void configure()
  {
    bind( EntityRepository.class ).to( EntityRepositoryImpl.class ).asEagerSingleton();
    bind( EntityChangeBroker.class ).to( EntityChangeBrokerImpl.class ).asEagerSingleton();
    bind( EntitySubscriptionManager.class ).to( EntitySubscriptionManagerImpl.class ).asEagerSingleton();
  }
}


Add Message.debug with access key.

Add Message.debug with access key.

--- org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
+++ org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
@@ -20,6 +20,7 @@
 import java.util.logging.Logger;

 import org.apache.ivy.plugins.resolver.RepositoryResolver;
+import org.apache.ivy.util.Message;

 /**
  * A dependency resolver that looks to an S3 repository to resolve dependencies.
@@ -33,6 +34,7 @@
 	}

 	public void setAccessKey(String accessKey) {
+		Message.debug("S3Resolver using accessKey " + accessKey);
 		((S3Repository)getRepository()).setAccessKey(accessKey);
 	}

<|original_code|>
/*
 * Copyright 2010 SpringSource
 *
 * 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.springframework.aws.ivy;

import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.ivy.plugins.resolver.RepositoryResolver;

/**
 * A dependency resolver that looks to an S3 repository to resolve dependencies.
 *
 * @author Ben Hale
 */
public class S3Resolver extends RepositoryResolver {

	static {
		Logger.getLogger("org.jets3t").setLevel(Level.OFF);
	}

	public void setAccessKey(String accessKey) {
		((S3Repository)getRepository()).setAccessKey(accessKey);
	}

	public void setSecretKey(String secretKey) {
		((S3Repository)getRepository()).setSecretKey(secretKey);
	}

	public S3Resolver() {
		setRepository(new S3Repository());
	}

	public String getTypeName() {
		return "S3";
	}
}

<|edits_diff|>
--- org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
+++ org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resolver.java
@@ -20,6 +20,7 @@
 import java.util.logging.Logger;

 import org.apache.ivy.plugins.resolver.RepositoryResolver;
+import org.apache.ivy.util.Message;

 /**
  * A dependency resolver that looks to an S3 repository to resolve dependencies.
<|current_version|>
/*
 * Copyright 2010 SpringSource
 *
 * 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.springframework.aws.ivy;

import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.ivy.plugins.resolver.RepositoryResolver;
import org.apache.ivy.util.Message;

/**
 * A dependency resolver that looks to an S3 repository to resolve dependencies.
 *
 * @author Ben Hale
 */
public class S3Resolver extends RepositoryResolver {

	static {
		Logger.getLogger("org.jets3t").setLevel(Level.OFF);
	}

	public void setAccessKey(String accessKey) {
		((S3Repository)getRepository()).setAccessKey(accessKey);
	}

	public void setSecretKey(String secretKey) {
		((S3Repository)getRepository()).setSecretKey(secretKey);
	}

	public S3Resolver() {
		setRepository(new S3Repository());
	}

	public String getTypeName() {
		return "S3";
	}
}

<|next_version|>
/*
 * Copyright 2010 SpringSource
 *
 * 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.springframework.aws.ivy;

import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.ivy.plugins.resolver.RepositoryResolver;
import org.apache.ivy.util.Message;

/**
 * A dependency resolver that looks to an S3 repository to resolve dependencies.
 *
 * @author Ben Hale
 */
public class S3Resolver extends RepositoryResolver {

	static {
		Logger.getLogger("org.jets3t").setLevel(Level.OFF);
	}

	public void setAccessKey(String accessKey) {
		Message.debug("S3Resolver using accessKey " + accessKey);
		((S3Repository)getRepository()).setAccessKey(accessKey);
	}

	public void setSecretKey(String secretKey) {
		((S3Repository)getRepository()).setSecretKey(secretKey);
	}

	public S3Resolver() {
		setRepository(new S3Repository());
	}

	public String getTypeName() {
		return "S3";
	}
}


Use correct HELP_ID for Canvas Template Manager Dialog

* HELP_ID was incorrect

--- uk.ac.bolton.archimate.canvas/src/uk/ac/bolton/archimate/canvas/templates/dialog/CanvasTemplateManagerDialog.java
+++ uk.ac.bolton.archimate.canvas/src/uk/ac/bolton/archimate/canvas/templates/dialog/CanvasTemplateManagerDialog.java
@@ -21,6 +21,8 @@
  */
 public class CanvasTemplateManagerDialog extends TemplateManagerDialog {

+    private static String HELP_ID = "uk.ac.bolton.archimate.help.CanvasTemplateManagerDialog"; //$NON-NLS-1$
+
     public CanvasTemplateManagerDialog(Shell parentShell, TemplateManager templateManager) {
         super(parentShell, templateManager);
     }
@@ -39,4 +41,8 @@
         return control;
     }

+    @Override
+    protected String getHelpID() {
+        return HELP_ID;
+    }
 }

<|original_code|>
/*******************************************************************************
 * Copyright (c) 2010 Bolton University, UK.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the License
 * which accompanies this distribution in the file LICENSE.txt
 *******************************************************************************/
package uk.ac.bolton.archimate.canvas.templates.dialog;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

import uk.ac.bolton.archimate.templates.dialog.TemplateManagerDialog;
import uk.ac.bolton.archimate.templates.model.TemplateManager;

/**
 * Canvas Template Manager Dialog
 *
 * @author Phillip Beauvoir
 */
public class CanvasTemplateManagerDialog extends TemplateManagerDialog {

    public CanvasTemplateManagerDialog(Shell parentShell, TemplateManager templateManager) {
        super(parentShell, templateManager);
    }

    @Override
    protected void configureShell(Shell shell) {
        super.configureShell(shell);
        shell.setText("My Canvasses");
    }

    @Override
    protected Control createDialogArea(Composite parent) {
        Control control = super.createDialogArea(parent);
        setTitle("Manage Canvas Templates");
        setMessage("Drag and drop Templates into Categories.");
        return control;
    }

}

<|edits_diff|>
--- uk.ac.bolton.archimate.canvas/src/uk/ac/bolton/archimate/canvas/templates/dialog/CanvasTemplateManagerDialog.java
+++ uk.ac.bolton.archimate.canvas/src/uk/ac/bolton/archimate/canvas/templates/dialog/CanvasTemplateManagerDialog.java
@@ -21,6 +21,8 @@
  */
 public class CanvasTemplateManagerDialog extends TemplateManagerDialog {

+    private static String HELP_ID = "uk.ac.bolton.archimate.help.CanvasTemplateManagerDialog"; //$NON-NLS-1$
+
     public CanvasTemplateManagerDialog(Shell parentShell, TemplateManager templateManager) {
         super(parentShell, templateManager);
     }
<|current_version|>
/*******************************************************************************
 * Copyright (c) 2010 Bolton University, UK.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the License
 * which accompanies this distribution in the file LICENSE.txt
 *******************************************************************************/
package uk.ac.bolton.archimate.canvas.templates.dialog;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

import uk.ac.bolton.archimate.templates.dialog.TemplateManagerDialog;
import uk.ac.bolton.archimate.templates.model.TemplateManager;

/**
 * Canvas Template Manager Dialog
 *
 * @author Phillip Beauvoir
 */
public class CanvasTemplateManagerDialog extends TemplateManagerDialog {

    private static String HELP_ID = "uk.ac.bolton.archimate.help.CanvasTemplateManagerDialog"; //$NON-NLS-1$

    public CanvasTemplateManagerDialog(Shell parentShell, TemplateManager templateManager) {
        super(parentShell, templateManager);
    }

    @Override
    protected void configureShell(Shell shell) {
        super.configureShell(shell);
        shell.setText("My Canvasses");
    }

    @Override
    protected Control createDialogArea(Composite parent) {
        Control control = super.createDialogArea(parent);
        setTitle("Manage Canvas Templates");
        setMessage("Drag and drop Templates into Categories.");
        return control;
    }

}

<|next_version|>
/*******************************************************************************
 * Copyright (c) 2010 Bolton University, UK.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the License
 * which accompanies this distribution in the file LICENSE.txt
 *******************************************************************************/
package uk.ac.bolton.archimate.canvas.templates.dialog;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

import uk.ac.bolton.archimate.templates.dialog.TemplateManagerDialog;
import uk.ac.bolton.archimate.templates.model.TemplateManager;

/**
 * Canvas Template Manager Dialog
 *
 * @author Phillip Beauvoir
 */
public class CanvasTemplateManagerDialog extends TemplateManagerDialog {

    private static String HELP_ID = "uk.ac.bolton.archimate.help.CanvasTemplateManagerDialog"; //$NON-NLS-1$

    public CanvasTemplateManagerDialog(Shell parentShell, TemplateManager templateManager) {
        super(parentShell, templateManager);
    }

    @Override
    protected void configureShell(Shell shell) {
        super.configureShell(shell);
        shell.setText("My Canvasses");
    }

    @Override
    protected Control createDialogArea(Composite parent) {
        Control control = super.createDialogArea(parent);
        setTitle("Manage Canvas Templates");
        setMessage("Drag and drop Templates into Categories.");
        return control;
    }

    @Override
    protected String getHelpID() {
        return HELP_ID;
    }
}


Add missing ui configuration on sample project

--- sample/src/main/java/io/rapidpro/sdk/sample/Application.java
+++ sample/src/main/java/io/rapidpro/sdk/sample/Application.java
@@ -1,4 +1,7 @@
 package io.rapidpro.sdk.sample;
+
+import android.support.annotation.ColorRes;
+import android.support.v4.content.res.ResourcesCompat;

 import io.rapidpro.sdk.FcmClient;
 import io.rapidpro.sdk.UiConfiguration;
@@ -24,6 +27,12 @@
                         .setPermissionMessage("Please give me permission to open floating chat!")
                         .setTheme(R.style.AppTheme_Blue)
                         .setIconResource(R.mipmap.ic_launcher)
+                        .setIconFloatingChat(R.mipmap.ic_launcher)
+                        .setTitleColor(getColorCompat(android.R.color.white))
                         .setTitleString("RapidPRO Sample SDK")));
     }
+
+    private int getColorCompat(@ColorRes int colorRes) {
+        return ResourcesCompat.getColor(getResources(), colorRes, getTheme());
+    }
 }

<|original_code|>
package io.rapidpro.sdk.sample;

import io.rapidpro.sdk.FcmClient;
import io.rapidpro.sdk.UiConfiguration;
import io.rapidpro.sdk.sample.services.PushRegistrationService;

/**
 * Created by John Cordeiro on 5/10/17.
 * Copyright © 2017 rapidpro-android-sdk, Inc. All rights reserved.
 */

public class Application extends android.app.Application {

    @Override
    public void onCreate() {
        super.onCreate();

        FcmClient.initialize(new FcmClient.Builder(this)
                .setHost("https://rapidpro.ilhasoft.mobi/")
                .setToken("f417616c57339f28e07bcedf8d4f23f74614bcb5")
                .setChannel("7815c7fb-eed7-41fe-b585-2a244d398fcb")
                .setRegistrationServiceClass(PushRegistrationService.class)
                .setUiConfiguration(new UiConfiguration()
                        .setPermissionMessage("Please give me permission to open floating chat!")
                        .setTheme(R.style.AppTheme_Blue)
                        .setIconResource(R.mipmap.ic_launcher)
                        .setTitleString("RapidPRO Sample SDK")));
    }
}

<|edits_diff|>
--- sample/src/main/java/io/rapidpro/sdk/sample/Application.java
+++ sample/src/main/java/io/rapidpro/sdk/sample/Application.java
@@ -1,4 +1,7 @@
 package io.rapidpro.sdk.sample;
+
+import android.support.annotation.ColorRes;
+import android.support.v4.content.res.ResourcesCompat;

 import io.rapidpro.sdk.FcmClient;
 import io.rapidpro.sdk.UiConfiguration;
@@ -24,6 +27,8 @@
                         .setPermissionMessage("Please give me permission to open floating chat!")
                         .setTheme(R.style.AppTheme_Blue)
                         .setIconResource(R.mipmap.ic_launcher)
+                        .setIconFloatingChat(R.mipmap.ic_launcher)
+                        .setTitleColor(getColorCompat(android.R.color.white))
                         .setTitleString("RapidPRO Sample SDK")));
     }
 }
<|current_version|>
package io.rapidpro.sdk.sample;

import android.support.annotation.ColorRes;
import android.support.v4.content.res.ResourcesCompat;

import io.rapidpro.sdk.FcmClient;
import io.rapidpro.sdk.UiConfiguration;
import io.rapidpro.sdk.sample.services.PushRegistrationService;

/**
 * Created by John Cordeiro on 5/10/17.
 * Copyright © 2017 rapidpro-android-sdk, Inc. All rights reserved.
 */

public class Application extends android.app.Application {

    @Override
    public void onCreate() {
        super.onCreate();

        FcmClient.initialize(new FcmClient.Builder(this)
                .setHost("https://rapidpro.ilhasoft.mobi/")
                .setToken("f417616c57339f28e07bcedf8d4f23f74614bcb5")
                .setChannel("7815c7fb-eed7-41fe-b585-2a244d398fcb")
                .setRegistrationServiceClass(PushRegistrationService.class)
                .setUiConfiguration(new UiConfiguration()
                        .setPermissionMessage("Please give me permission to open floating chat!")
                        .setTheme(R.style.AppTheme_Blue)
                        .setIconResource(R.mipmap.ic_launcher)
                        .setIconFloatingChat(R.mipmap.ic_launcher)
                        .setTitleColor(getColorCompat(android.R.color.white))
                        .setTitleString("RapidPRO Sample SDK")));
    }
}

<|next_version|>
package io.rapidpro.sdk.sample;

import android.support.annotation.ColorRes;
import android.support.v4.content.res.ResourcesCompat;

import io.rapidpro.sdk.FcmClient;
import io.rapidpro.sdk.UiConfiguration;
import io.rapidpro.sdk.sample.services.PushRegistrationService;

/**
 * Created by John Cordeiro on 5/10/17.
 * Copyright © 2017 rapidpro-android-sdk, Inc. All rights reserved.
 */

public class Application extends android.app.Application {

    @Override
    public void onCreate() {
        super.onCreate();

        FcmClient.initialize(new FcmClient.Builder(this)
                .setHost("https://rapidpro.ilhasoft.mobi/")
                .setToken("f417616c57339f28e07bcedf8d4f23f74614bcb5")
                .setChannel("7815c7fb-eed7-41fe-b585-2a244d398fcb")
                .setRegistrationServiceClass(PushRegistrationService.class)
                .setUiConfiguration(new UiConfiguration()
                        .setPermissionMessage("Please give me permission to open floating chat!")
                        .setTheme(R.style.AppTheme_Blue)
                        .setIconResource(R.mipmap.ic_launcher)
                        .setIconFloatingChat(R.mipmap.ic_launcher)
                        .setTitleColor(getColorCompat(android.R.color.white))
                        .setTitleString("RapidPRO Sample SDK")));
    }

    private int getColorCompat(@ColorRes int colorRes) {
        return ResourcesCompat.getColor(getResources(), colorRes, getTheme());
    }
}


Make sure the files are loaded correctly

git-svn-id: 6e5f6f61bd1b925b71fe8065f445f9178a317ca5@350 7701cf9b-ed3c-0410-a7c3-1ff289697e89

--- src/test/java/com/crawljax/util/PrettyHTMLTest.java
+++ src/test/java/com/crawljax/util/PrettyHTMLTest.java
@@ -1,6 +1,7 @@
 package com.crawljax.util;

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;

 import java.io.File;

@@ -17,6 +18,9 @@
 		String testdom = Helper.getContent(new File(TESTFILE));
 		String controldom = Helper.getContent(new File(CONTROLFILE));

+		assertNotNull("File should be read", testdom);
+		assertNotNull("File should be read", controldom);
+
 		testdom = PrettyHTML.prettyHTML(testdom);

 		assertEquals(controldom, testdom);

<|original_code|>
package com.crawljax.util;

import static org.junit.Assert.assertEquals;

import java.io.File;

import org.junit.Test;

public class PrettyHTMLTest {

	private static final String TESTFILE = "src/test/java/com/crawljax/util/tuduDombefore.html";
	private static final String CONTROLFILE =
	        "src/test/java/com/crawljax/util/tuduDombefore.html.tidy";

	@Test
	public void prettifyHTML() {
		String testdom = Helper.getContent(new File(TESTFILE));
		String controldom = Helper.getContent(new File(CONTROLFILE));

		testdom = PrettyHTML.prettyHTML(testdom);

		assertEquals(controldom, testdom);
	}
}

<|edits_diff|>
--- src/test/java/com/crawljax/util/PrettyHTMLTest.java
+++ src/test/java/com/crawljax/util/PrettyHTMLTest.java
@@ -1,6 +1,7 @@
 package com.crawljax.util;

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;

 import java.io.File;

<|current_version|>
package com.crawljax.util;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import java.io.File;

import org.junit.Test;

public class PrettyHTMLTest {

	private static final String TESTFILE = "src/test/java/com/crawljax/util/tuduDombefore.html";
	private static final String CONTROLFILE =
	        "src/test/java/com/crawljax/util/tuduDombefore.html.tidy";

	@Test
	public void prettifyHTML() {
		String testdom = Helper.getContent(new File(TESTFILE));
		String controldom = Helper.getContent(new File(CONTROLFILE));

		testdom = PrettyHTML.prettyHTML(testdom);

		assertEquals(controldom, testdom);
	}
}

<|next_version|>
package com.crawljax.util;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import java.io.File;

import org.junit.Test;

public class PrettyHTMLTest {

	private static final String TESTFILE = "src/test/java/com/crawljax/util/tuduDombefore.html";
	private static final String CONTROLFILE =
	        "src/test/java/com/crawljax/util/tuduDombefore.html.tidy";

	@Test
	public void prettifyHTML() {
		String testdom = Helper.getContent(new File(TESTFILE));
		String controldom = Helper.getContent(new File(CONTROLFILE));

		assertNotNull("File should be read", testdom);
		assertNotNull("File should be read", controldom);

		testdom = PrettyHTML.prettyHTML(testdom);

		assertEquals(controldom, testdom);
	}
}


Add more stuff to JUnit-5-in-4-test suite

--- src/test/java/org/codefx/demo/junit5/TestWithJUnit5.java
+++ src/test/java/org/codefx/demo/junit5/TestWithJUnit5.java
@@ -1,9 +1,13 @@
 package org.codefx.demo.junit5;

+import org.junit.platform.runner.IncludeClassNamePattern;
+import org.junit.platform.runner.IncludeEngines;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.runner.SelectPackages;
 import org.junit.runner.RunWith;

 @RunWith(JUnitPlatform.class)
 @SelectPackages({ "org.codefx.demo.junit5" })
+@IncludeClassNamePattern(".*Tests?")
+@IncludeEngines("junit-jupiter")
 public class TestWithJUnit5 { }

<|original_code|>
package org.codefx.demo.junit5;

import org.junit.platform.runner.JUnitPlatform;
import org.junit.platform.runner.SelectPackages;
import org.junit.runner.RunWith;

@RunWith(JUnitPlatform.class)
@SelectPackages({ "org.codefx.demo.junit5" })
public class TestWithJUnit5 { }

<|edits_diff|>
--- src/test/java/org/codefx/demo/junit5/TestWithJUnit5.java
+++ src/test/java/org/codefx/demo/junit5/TestWithJUnit5.java
@@ -1,5 +1,7 @@
 package org.codefx.demo.junit5;

+import org.junit.platform.runner.IncludeClassNamePattern;
+import org.junit.platform.runner.IncludeEngines;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.runner.SelectPackages;
 import org.junit.runner.RunWith;
<|current_version|>
package org.codefx.demo.junit5;

import org.junit.platform.runner.IncludeClassNamePattern;
import org.junit.platform.runner.IncludeEngines;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.platform.runner.SelectPackages;
import org.junit.runner.RunWith;

@RunWith(JUnitPlatform.class)
@SelectPackages({ "org.codefx.demo.junit5" })
public class TestWithJUnit5 { }

<|next_version|>
package org.codefx.demo.junit5;

import org.junit.platform.runner.IncludeClassNamePattern;
import org.junit.platform.runner.IncludeEngines;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.platform.runner.SelectPackages;
import org.junit.runner.RunWith;

@RunWith(JUnitPlatform.class)
@SelectPackages({ "org.codefx.demo.junit5" })
@IncludeClassNamePattern(".*Tests?")
@IncludeEngines("junit-jupiter")
public class TestWithJUnit5 { }


Add update builder starting point 'service(URL)'

--- jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExec.java
+++ jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExec.java
@@ -19,12 +19,19 @@
 package org.apache.jena.sparql.exec;

 import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.exec.http.UpdateExecHTTP;
 import org.apache.jena.update.UpdateProcessor;

 public interface UpdateExec extends UpdateProcessor
 {
+    /** Create a {@link UpdateExecBuilder} for a dataset. */
     public static UpdateExecBuilder dataset(DatasetGraph dataset) {
         return UpdateExecDatasetBuilder.create().dataset(dataset);
+    }
+
+    /** Create a {@link UpdateExecBuilder} for a remote endpoint. */
+    public static UpdateExecBuilder service(String serviceURL) {
+        return UpdateExecHTTP.newBuilder().endpoint(serviceURL);
     }

     public static UpdateExecDatasetBuilder newBuilder() {

<|original_code|>
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF 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.
 */

package org.apache.jena.sparql.exec;

import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.update.UpdateProcessor;

public interface UpdateExec extends UpdateProcessor
{
    public static UpdateExecBuilder dataset(DatasetGraph dataset) {
        return UpdateExecDatasetBuilder.create().dataset(dataset);
    }

    public static UpdateExecDatasetBuilder newBuilder() {
        return UpdateExecDatasetBuilder.create();
    }

    /** Execute */
    @Override
    public void execute();
}

<|edits_diff|>
--- jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExec.java
+++ jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExec.java
@@ -19,10 +19,12 @@
 package org.apache.jena.sparql.exec;

 import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.exec.http.UpdateExecHTTP;
 import org.apache.jena.update.UpdateProcessor;

 public interface UpdateExec extends UpdateProcessor
 {
+    /** Create a {@link UpdateExecBuilder} for a dataset. */
     public static UpdateExecBuilder dataset(DatasetGraph dataset) {
         return UpdateExecDatasetBuilder.create().dataset(dataset);
     }
<|current_version|>
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF 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.
 */

package org.apache.jena.sparql.exec;

import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.exec.http.UpdateExecHTTP;
import org.apache.jena.update.UpdateProcessor;

public interface UpdateExec extends UpdateProcessor
{
    /** Create a {@link UpdateExecBuilder} for a dataset. */
    public static UpdateExecBuilder dataset(DatasetGraph dataset) {
        return UpdateExecDatasetBuilder.create().dataset(dataset);
    }

    public static UpdateExecDatasetBuilder newBuilder() {
        return UpdateExecDatasetBuilder.create();
    }

    /** Execute */
    @Override
    public void execute();
}

<|next_version|>
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF 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.
 */

package org.apache.jena.sparql.exec;

import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.exec.http.UpdateExecHTTP;
import org.apache.jena.update.UpdateProcessor;

public interface UpdateExec extends UpdateProcessor
{
    /** Create a {@link UpdateExecBuilder} for a dataset. */
    public static UpdateExecBuilder dataset(DatasetGraph dataset) {
        return UpdateExecDatasetBuilder.create().dataset(dataset);
    }

    /** Create a {@link UpdateExecBuilder} for a remote endpoint. */
    public static UpdateExecBuilder service(String serviceURL) {
        return UpdateExecHTTP.newBuilder().endpoint(serviceURL);
    }

    public static UpdateExecDatasetBuilder newBuilder() {
        return UpdateExecDatasetBuilder.create();
    }

    /** Execute */
    @Override
    public void execute();
}


Add new singleton for Intake resource

CSPACE-210: Add new singleton for Intake resource

--- services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -1,6 +1,8 @@
 package org.collectionspace.services.jaxrs;

 import org.collectionspace.services.CollectionObjectResource;
+import org.collectionspace.services.IntakeResource;
+
 import javax.ws.rs.core.Application;
 import java.util.HashSet;
 import java.util.Set;
@@ -12,6 +14,7 @@

     public CollectionSpaceJaxRsApplication() {
         singletons.add(new CollectionObjectResource());
+        singletons.add(new IntakeResource());
 //        singletons.add(new DomainIdentifierResource());
 //        singletons.add(new PingResource());
     }

<|original_code|>
package org.collectionspace.services.jaxrs;

import org.collectionspace.services.CollectionObjectResource;
import javax.ws.rs.core.Application;
import java.util.HashSet;
import java.util.Set;

public class CollectionSpaceJaxRsApplication extends Application {

    private Set<Object> singletons = new HashSet<Object>();
    private Set<Class<?>> empty = new HashSet<Class<?>>();

    public CollectionSpaceJaxRsApplication() {
        singletons.add(new CollectionObjectResource());
//        singletons.add(new DomainIdentifierResource());
//        singletons.add(new PingResource());
    }

    @Override
    public Set<Class<?>> getClasses() {
        return empty;
    }

    @Override
    public Set<Object> getSingletons() {
        return singletons;
    }
}

<|edits_diff|>
--- services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -1,6 +1,8 @@
 package org.collectionspace.services.jaxrs;

 import org.collectionspace.services.CollectionObjectResource;
+import org.collectionspace.services.IntakeResource;
+
 import javax.ws.rs.core.Application;
 import java.util.HashSet;
 import java.util.Set;
<|current_version|>
package org.collectionspace.services.jaxrs;

import org.collectionspace.services.CollectionObjectResource;
import org.collectionspace.services.IntakeResource;

import javax.ws.rs.core.Application;
import java.util.HashSet;
import java.util.Set;

public class CollectionSpaceJaxRsApplication extends Application {

    private Set<Object> singletons = new HashSet<Object>();
    private Set<Class<?>> empty = new HashSet<Class<?>>();

    public CollectionSpaceJaxRsApplication() {
        singletons.add(new CollectionObjectResource());
//        singletons.add(new DomainIdentifierResource());
//        singletons.add(new PingResource());
    }

    @Override
    public Set<Class<?>> getClasses() {
        return empty;
    }

    @Override
    public Set<Object> getSingletons() {
        return singletons;
    }
}

<|next_version|>
package org.collectionspace.services.jaxrs;

import org.collectionspace.services.CollectionObjectResource;
import org.collectionspace.services.IntakeResource;

import javax.ws.rs.core.Application;
import java.util.HashSet;
import java.util.Set;

public class CollectionSpaceJaxRsApplication extends Application {

    private Set<Object> singletons = new HashSet<Object>();
    private Set<Class<?>> empty = new HashSet<Class<?>>();

    public CollectionSpaceJaxRsApplication() {
        singletons.add(new CollectionObjectResource());
        singletons.add(new IntakeResource());
//        singletons.add(new DomainIdentifierResource());
//        singletons.add(new PingResource());
    }

    @Override
    public Set<Class<?>> getClasses() {
        return empty;
    }

    @Override
    public Set<Object> getSingletons() {
        return singletons;
    }
}


Add ContactInfo pane to create vendor pane

OPEN - task 79: Create Party Module
http://github.com/DevOpsDistilled/OpERP/issues/issue/79

--- OpERP/src/main/java/devopsdistilled/operp/client/party/panes/controllers/impl/CreateVendorPaneControllerImpl.java
+++ OpERP/src/main/java/devopsdistilled/operp/client/party/panes/controllers/impl/CreateVendorPaneControllerImpl.java
@@ -1,7 +1,9 @@
 package devopsdistilled.operp.client.party.panes.controllers.impl;

 import javax.inject.Inject;
+import javax.swing.JPanel;

+import devopsdistilled.operp.client.commons.panes.controllers.CreateContactInfoPaneController;
 import devopsdistilled.operp.client.exceptions.EntityValidationException;
 import devopsdistilled.operp.client.party.panes.CreateVendorPane;
 import devopsdistilled.operp.client.party.panes.controllers.CreateVendorPaneController;
@@ -17,6 +19,9 @@
 	@Inject
 	private CreateVendorPaneModel model;

+	@Inject
+	private CreateContactInfoPaneController createContactInfoPaneController;
+
 	@Override
 	public void validate(Vendor entity) throws EntityValidationException {
 		// TODO Auto-generated method stub
@@ -31,6 +36,10 @@

 	@Override
 	public void init() {
+		createContactInfoPaneController.getView().setController(
+				createContactInfoPaneController);
+		view.setContactInfopanel((JPanel) createContactInfoPaneController
+				.getView().getPane());
 		view.init();
 		model.registerObserver(view);
 	}

<|original_code|>
package devopsdistilled.operp.client.party.panes.controllers.impl;

import javax.inject.Inject;

import devopsdistilled.operp.client.exceptions.EntityValidationException;
import devopsdistilled.operp.client.party.panes.CreateVendorPane;
import devopsdistilled.operp.client.party.panes.controllers.CreateVendorPaneController;
import devopsdistilled.operp.client.party.panes.models.CreateVendorPaneModel;
import devopsdistilled.operp.server.data.entity.party.Vendor;

public class CreateVendorPaneControllerImpl implements
		CreateVendorPaneController {

	@Inject
	private CreateVendorPane view;

	@Inject
	private CreateVendorPaneModel model;

	@Override
	public void validate(Vendor entity) throws EntityValidationException {
		// TODO Auto-generated method stub

	}

	@Override
	public Vendor save(Vendor entity) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	public void init() {
		view.init();
		model.registerObserver(view);
	}

}

<|edits_diff|>
--- OpERP/src/main/java/devopsdistilled/operp/client/party/panes/controllers/impl/CreateVendorPaneControllerImpl.java
+++ OpERP/src/main/java/devopsdistilled/operp/client/party/panes/controllers/impl/CreateVendorPaneControllerImpl.java
@@ -1,7 +1,9 @@
 package devopsdistilled.operp.client.party.panes.controllers.impl;

 import javax.inject.Inject;
+import javax.swing.JPanel;

+import devopsdistilled.operp.client.commons.panes.controllers.CreateContactInfoPaneController;
 import devopsdistilled.operp.client.exceptions.EntityValidationException;
 import devopsdistilled.operp.client.party.panes.CreateVendorPane;
 import devopsdistilled.operp.client.party.panes.controllers.CreateVendorPaneController;
@@ -16,6 +18,9 @@

 	@Inject
 	private CreateVendorPaneModel model;
+
+	@Inject
+	private CreateContactInfoPaneController createContactInfoPaneController;

 	@Override
 	public void validate(Vendor entity) throws EntityValidationException {
<|current_version|>
package devopsdistilled.operp.client.party.panes.controllers.impl;

import javax.inject.Inject;
import javax.swing.JPanel;

import devopsdistilled.operp.client.commons.panes.controllers.CreateContactInfoPaneController;
import devopsdistilled.operp.client.exceptions.EntityValidationException;
import devopsdistilled.operp.client.party.panes.CreateVendorPane;
import devopsdistilled.operp.client.party.panes.controllers.CreateVendorPaneController;
import devopsdistilled.operp.client.party.panes.models.CreateVendorPaneModel;
import devopsdistilled.operp.server.data.entity.party.Vendor;

public class CreateVendorPaneControllerImpl implements
		CreateVendorPaneController {

	@Inject
	private CreateVendorPane view;

	@Inject
	private CreateVendorPaneModel model;

	@Inject
	private CreateContactInfoPaneController createContactInfoPaneController;

	@Override
	public void validate(Vendor entity) throws EntityValidationException {
		// TODO Auto-generated method stub

	}

	@Override
	public Vendor save(Vendor entity) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	public void init() {
		view.init();
		model.registerObserver(view);
	}

}

<|next_version|>
package devopsdistilled.operp.client.party.panes.controllers.impl;

import javax.inject.Inject;
import javax.swing.JPanel;

import devopsdistilled.operp.client.commons.panes.controllers.CreateContactInfoPaneController;
import devopsdistilled.operp.client.exceptions.EntityValidationException;
import devopsdistilled.operp.client.party.panes.CreateVendorPane;
import devopsdistilled.operp.client.party.panes.controllers.CreateVendorPaneController;
import devopsdistilled.operp.client.party.panes.models.CreateVendorPaneModel;
import devopsdistilled.operp.server.data.entity.party.Vendor;

public class CreateVendorPaneControllerImpl implements
		CreateVendorPaneController {

	@Inject
	private CreateVendorPane view;

	@Inject
	private CreateVendorPaneModel model;

	@Inject
	private CreateContactInfoPaneController createContactInfoPaneController;

	@Override
	public void validate(Vendor entity) throws EntityValidationException {
		// TODO Auto-generated method stub

	}

	@Override
	public Vendor save(Vendor entity) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	public void init() {
		createContactInfoPaneController.getView().setController(
				createContactInfoPaneController);
		view.setContactInfopanel((JPanel) createContactInfoPaneController
				.getView().getPane());
		view.init();
		model.registerObserver(view);
	}

}


Add @DirtiesContext for test preceding the failing test

--- webapp/idol/src/test/java/com/hp/autonomy/frontend/find/idol/parametricfields/IdolParametricValuesServiceIT.java
+++ webapp/idol/src/test/java/com/hp/autonomy/frontend/find/idol/parametricfields/IdolParametricValuesServiceIT.java
@@ -6,5 +6,7 @@
 package com.hp.autonomy.frontend.find.idol.parametricfields;

 import com.hp.autonomy.frontend.find.core.parametricfields.AbstractParametricValuesServiceIT;
+import org.springframework.test.annotation.DirtiesContext;

+@DirtiesContext
 public class IdolParametricValuesServiceIT extends AbstractParametricValuesServiceIT {}

<|original_code|>
/*
 * Copyright 2015-2017 Hewlett Packard Enterprise Development Company, L.P.
 * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
 */

package com.hp.autonomy.frontend.find.idol.parametricfields;

import com.hp.autonomy.frontend.find.core.parametricfields.AbstractParametricValuesServiceIT;

public class IdolParametricValuesServiceIT extends AbstractParametricValuesServiceIT {}

<|edits_diff|>
--- webapp/idol/src/test/java/com/hp/autonomy/frontend/find/idol/parametricfields/IdolParametricValuesServiceIT.java
+++ webapp/idol/src/test/java/com/hp/autonomy/frontend/find/idol/parametricfields/IdolParametricValuesServiceIT.java
@@ -6,5 +6,6 @@
 package com.hp.autonomy.frontend.find.idol.parametricfields;

 import com.hp.autonomy.frontend.find.core.parametricfields.AbstractParametricValuesServiceIT;
+import org.springframework.test.annotation.DirtiesContext;

 public class IdolParametricValuesServiceIT extends AbstractParametricValuesServiceIT {}
<|current_version|>
/*
 * Copyright 2015-2017 Hewlett Packard Enterprise Development Company, L.P.
 * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
 */

package com.hp.autonomy.frontend.find.idol.parametricfields;

import com.hp.autonomy.frontend.find.core.parametricfields.AbstractParametricValuesServiceIT;
import org.springframework.test.annotation.DirtiesContext;

public class IdolParametricValuesServiceIT extends AbstractParametricValuesServiceIT {}

<|next_version|>
/*
 * Copyright 2015-2017 Hewlett Packard Enterprise Development Company, L.P.
 * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
 */

package com.hp.autonomy.frontend.find.idol.parametricfields;

import com.hp.autonomy.frontend.find.core.parametricfields.AbstractParametricValuesServiceIT;
import org.springframework.test.annotation.DirtiesContext;

@DirtiesContext
public class IdolParametricValuesServiceIT extends AbstractParametricValuesServiceIT {}


Add function to Virtual Queue Repository interface

--- backendservice/src/main/java/com/google/gpay/virtualqueue/backendservice/repository/VirtualQueueRepository.java
+++ backendservice/src/main/java/com/google/gpay/virtualqueue/backendservice/repository/VirtualQueueRepository.java
@@ -16,10 +16,12 @@

 package com.google.gpay.virtualqueue.backendservice.repository;

+import java.util.List;
 import java.util.Map;
 import java.util.UUID;

 import com.google.gpay.virtualqueue.backendservice.model.Shop;
+import com.google.gpay.virtualqueue.backendservice.model.Token;
 import com.google.gpay.virtualqueue.backendservice.proto.CreateShopRequest;

 public interface VirtualQueueRepository {
@@ -27,4 +29,6 @@
     public UUID createShop(CreateShopRequest createShopRequest);

     public Map<UUID, Shop> getAllShops();
+
+    public List<Token> getTokensByShopId(UUID shopId);
 }

<|original_code|>
/*
Copyright 2020 Google LLC

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

    https://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.gpay.virtualqueue.backendservice.repository;

import java.util.Map;
import java.util.UUID;

import com.google.gpay.virtualqueue.backendservice.model.Shop;
import com.google.gpay.virtualqueue.backendservice.proto.CreateShopRequest;

public interface VirtualQueueRepository {

    public UUID createShop(CreateShopRequest createShopRequest);

    public Map<UUID, Shop> getAllShops();
}

<|edits_diff|>
--- backendservice/src/main/java/com/google/gpay/virtualqueue/backendservice/repository/VirtualQueueRepository.java
+++ backendservice/src/main/java/com/google/gpay/virtualqueue/backendservice/repository/VirtualQueueRepository.java
@@ -16,10 +16,12 @@

 package com.google.gpay.virtualqueue.backendservice.repository;

+import java.util.List;
 import java.util.Map;
 import java.util.UUID;

 import com.google.gpay.virtualqueue.backendservice.model.Shop;
+import com.google.gpay.virtualqueue.backendservice.model.Token;
 import com.google.gpay.virtualqueue.backendservice.proto.CreateShopRequest;

 public interface VirtualQueueRepository {
<|current_version|>
/*
Copyright 2020 Google LLC

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

    https://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.gpay.virtualqueue.backendservice.repository;

import java.util.List;
import java.util.Map;
import java.util.UUID;

import com.google.gpay.virtualqueue.backendservice.model.Shop;
import com.google.gpay.virtualqueue.backendservice.model.Token;
import com.google.gpay.virtualqueue.backendservice.proto.CreateShopRequest;

public interface VirtualQueueRepository {

    public UUID createShop(CreateShopRequest createShopRequest);

    public Map<UUID, Shop> getAllShops();
}

<|next_version|>
/*
Copyright 2020 Google LLC

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

    https://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.gpay.virtualqueue.backendservice.repository;

import java.util.List;
import java.util.Map;
import java.util.UUID;

import com.google.gpay.virtualqueue.backendservice.model.Shop;
import com.google.gpay.virtualqueue.backendservice.model.Token;
import com.google.gpay.virtualqueue.backendservice.proto.CreateShopRequest;

public interface VirtualQueueRepository {

    public UUID createShop(CreateShopRequest createShopRequest);

    public Map<UUID, Shop> getAllShops();

    public List<Token> getTokensByShopId(UUID shopId);
}


Disable indentpadding test, note why

Disable indentpadding test, note why

--- org.spoofax.jsglr2.integrationtest/src/test/java/org/spoofax/jsglr2/integrationtest/languages/StrategoTest.java
+++ org.spoofax.jsglr2.integrationtest/src/test/java/org/spoofax/jsglr2/integrationtest/languages/StrategoTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.stream.Stream;

+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.spoofax.interpreter.terms.IStrategoTerm;
@@ -22,6 +23,7 @@
         return testSuccessByAstString(sampleProgram, expectedAST.toString());
     }

+    @Disabled("The {indentpadding} attribute is not supported by JSGLR2 imploding due to concerns around incremental parsing")
     @TestFactory public Stream<DynamicTest> testIndentPadding() throws ParseError, IOException {
         String sampleProgram = getFileAsString("Stratego/test112.str");
         IStrategoTerm expectedAST = getFileAsAST("Stratego/test112.aterm");

<|original_code|>
package org.spoofax.jsglr2.integrationtest.languages;

import java.io.IOException;
import java.util.stream.Stream;

import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.jsglr2.integrationtest.BaseTestWithParseTableFromTermWithJSGLR1;
import org.spoofax.terms.ParseError;

public class StrategoTest extends BaseTestWithParseTableFromTermWithJSGLR1 {

    public StrategoTest() throws Exception {
        setupParseTable("Stratego");
    }

    @TestFactory public Stream<DynamicTest> testAmbByExpectedAST() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/ambiguity-issue.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/ambiguity-issue.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

    @TestFactory public Stream<DynamicTest> testIndentPadding() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/test112.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/test112.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

}
<|edits_diff|>
--- org.spoofax.jsglr2.integrationtest/src/test/java/org/spoofax/jsglr2/integrationtest/languages/StrategoTest.java
+++ org.spoofax.jsglr2.integrationtest/src/test/java/org/spoofax/jsglr2/integrationtest/languages/StrategoTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.stream.Stream;

+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.spoofax.interpreter.terms.IStrategoTerm;
<|current_version|>
package org.spoofax.jsglr2.integrationtest.languages;

import java.io.IOException;
import java.util.stream.Stream;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.jsglr2.integrationtest.BaseTestWithParseTableFromTermWithJSGLR1;
import org.spoofax.terms.ParseError;

public class StrategoTest extends BaseTestWithParseTableFromTermWithJSGLR1 {

    public StrategoTest() throws Exception {
        setupParseTable("Stratego");
    }

    @TestFactory public Stream<DynamicTest> testAmbByExpectedAST() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/ambiguity-issue.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/ambiguity-issue.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

    @TestFactory public Stream<DynamicTest> testIndentPadding() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/test112.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/test112.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

}
<|next_version|>
package org.spoofax.jsglr2.integrationtest.languages;

import java.io.IOException;
import java.util.stream.Stream;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.jsglr2.integrationtest.BaseTestWithParseTableFromTermWithJSGLR1;
import org.spoofax.terms.ParseError;

public class StrategoTest extends BaseTestWithParseTableFromTermWithJSGLR1 {

    public StrategoTest() throws Exception {
        setupParseTable("Stratego");
    }

    @TestFactory public Stream<DynamicTest> testAmbByExpectedAST() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/ambiguity-issue.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/ambiguity-issue.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

    @Disabled("The {indentpadding} attribute is not supported by JSGLR2 imploding due to concerns around incremental parsing")
    @TestFactory public Stream<DynamicTest> testIndentPadding() throws ParseError, IOException {
        String sampleProgram = getFileAsString("Stratego/test112.str");
        IStrategoTerm expectedAST = getFileAsAST("Stratego/test112.aterm");

        return testSuccessByAstString(sampleProgram, expectedAST.toString());
    }

}


Disable test which is not yet working on CI

--- test-common/src/test/java/com/gentics/mesh/test/docker/MeshDockerServerTest.java
+++ test-common/src/test/java/com/gentics/mesh/test/docker/MeshDockerServerTest.java
@@ -4,12 +4,14 @@
 import static org.junit.Assert.assertEquals;

 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;

 import com.gentics.mesh.core.rest.user.UserListResponse;

 import io.vertx.core.Vertx;

+@Ignore
 public class MeshDockerServerTest {

 	@ClassRule

<|original_code|>
package com.gentics.mesh.test.docker;

import static com.gentics.mesh.test.ClientHelper.call;
import static org.junit.Assert.assertEquals;

import org.junit.ClassRule;
import org.junit.Test;

import com.gentics.mesh.core.rest.user.UserListResponse;

import io.vertx.core.Vertx;

public class MeshDockerServerTest {

	@ClassRule
	public static MeshDockerServer server = new MeshDockerServer("gentics/mesh:0.10.0", "dummy", true, Vertx.vertx(), null, null);

	@Test
	public void testDockerImage() {
		UserListResponse response = call(() -> server.getMeshClient().findUsers());
		assertEquals(2, response.getData().size());
	}

}

<|edits_diff|>
--- test-common/src/test/java/com/gentics/mesh/test/docker/MeshDockerServerTest.java
+++ test-common/src/test/java/com/gentics/mesh/test/docker/MeshDockerServerTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertEquals;

 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;

 import com.gentics.mesh.core.rest.user.UserListResponse;
<|current_version|>
package com.gentics.mesh.test.docker;

import static com.gentics.mesh.test.ClientHelper.call;
import static org.junit.Assert.assertEquals;

import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;

import com.gentics.mesh.core.rest.user.UserListResponse;

import io.vertx.core.Vertx;

public class MeshDockerServerTest {

	@ClassRule
	public static MeshDockerServer server = new MeshDockerServer("gentics/mesh:0.10.0", "dummy", true, Vertx.vertx(), null, null);

	@Test
	public void testDockerImage() {
		UserListResponse response = call(() -> server.getMeshClient().findUsers());
		assertEquals(2, response.getData().size());
	}

}

<|next_version|>
package com.gentics.mesh.test.docker;

import static com.gentics.mesh.test.ClientHelper.call;
import static org.junit.Assert.assertEquals;

import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;

import com.gentics.mesh.core.rest.user.UserListResponse;

import io.vertx.core.Vertx;

@Ignore
public class MeshDockerServerTest {

	@ClassRule
	public static MeshDockerServer server = new MeshDockerServer("gentics/mesh:0.10.0", "dummy", true, Vertx.vertx(), null, null);

	@Test
	public void testDockerImage() {
		UserListResponse response = call(() -> server.getMeshClient().findUsers());
		assertEquals(2, response.getData().size());
	}

}


Set default log level to WARN, to avoid excessive INFO log from ZK

--- zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
+++ zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
@@ -3,6 +3,7 @@

 import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 import org.apache.zookeeper.ZooKeeperMain;
+import org.slf4j.impl.SimpleLogger;

 import java.io.IOException;

@@ -10,6 +11,11 @@
  * @author bjorncs
  */
 public class Main {
+
+    static {
+        System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "WARN");
+    }
+
     public static void main(String[] args) throws IOException, InterruptedException {
         new ZkClientConfigBuilder()
                 .toConfigProperties()

<|original_code|>
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.zookeeper.cli;

import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
import org.apache.zookeeper.ZooKeeperMain;

import java.io.IOException;

/**
 * @author bjorncs
 */
public class Main {
    public static void main(String[] args) throws IOException, InterruptedException {
        new ZkClientConfigBuilder()
                .toConfigProperties()
                .forEach(System::setProperty);
        ZooKeeperMain.main(args);
    }
}

<|edits_diff|>
--- zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
+++ zookeeper-command-line-client/src/main/java/com/yahoo/vespa/zookeeper/cli/Main.java
@@ -3,6 +3,7 @@

 import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 import org.apache.zookeeper.ZooKeeperMain;
+import org.slf4j.impl.SimpleLogger;

 import java.io.IOException;

<|current_version|>
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.zookeeper.cli;

import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
import org.apache.zookeeper.ZooKeeperMain;
import org.slf4j.impl.SimpleLogger;

import java.io.IOException;

/**
 * @author bjorncs
 */
public class Main {
    public static void main(String[] args) throws IOException, InterruptedException {
        new ZkClientConfigBuilder()
                .toConfigProperties()
                .forEach(System::setProperty);
        ZooKeeperMain.main(args);
    }
}

<|next_version|>
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.zookeeper.cli;

import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
import org.apache.zookeeper.ZooKeeperMain;
import org.slf4j.impl.SimpleLogger;

import java.io.IOException;

/**
 * @author bjorncs
 */
public class Main {

    static {
        System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "WARN");
    }

    public static void main(String[] args) throws IOException, InterruptedException {
        new ZkClientConfigBuilder()
                .toConfigProperties()
                .forEach(System::setProperty);
        ZooKeeperMain.main(args);
    }
}


Set type for general datatype.

Set type for general datatype.

--- src/main/java/de/uni_stuttgart/vis/vowl/owl2vowl/model/nodes/datatypes/BaseDatatype.java
+++ src/main/java/de/uni_stuttgart/vis/vowl/owl2vowl/model/nodes/datatypes/BaseDatatype.java
@@ -1,5 +1,6 @@
 package de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.datatypes;

+import de.uni_stuttgart.vis.vowl.owl2vowl.constants.Node_Types;
 import de.uni_stuttgart.vis.vowl.owl2vowl.export.JsonGeneratorVisitor;
 import de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.BaseNode;

@@ -7,6 +8,7 @@
 	protected static int counterObjects = 1;

 	protected BaseDatatype() {
+		setType(Node_Types.TYPE_DATATYPE);
 	}

 	protected abstract void setID();

<|original_code|>
package de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.datatypes;

import de.uni_stuttgart.vis.vowl.owl2vowl.export.JsonGeneratorVisitor;
import de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.BaseNode;

public abstract class BaseDatatype extends BaseNode {
	protected static int counterObjects = 1;

	protected BaseDatatype() {
	}

	protected abstract void setID();

	@Override
	public void accept(JsonGeneratorVisitor visitor) {
		super.accept(visitor);
		visitor.visit(this);
	}
}

<|edits_diff|>
--- src/main/java/de/uni_stuttgart/vis/vowl/owl2vowl/model/nodes/datatypes/BaseDatatype.java
+++ src/main/java/de/uni_stuttgart/vis/vowl/owl2vowl/model/nodes/datatypes/BaseDatatype.java
@@ -1,5 +1,6 @@
 package de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.datatypes;

+import de.uni_stuttgart.vis.vowl.owl2vowl.constants.Node_Types;
 import de.uni_stuttgart.vis.vowl.owl2vowl.export.JsonGeneratorVisitor;
 import de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.BaseNode;

<|current_version|>
package de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.datatypes;

import de.uni_stuttgart.vis.vowl.owl2vowl.constants.Node_Types;
import de.uni_stuttgart.vis.vowl.owl2vowl.export.JsonGeneratorVisitor;
import de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.BaseNode;

public abstract class BaseDatatype extends BaseNode {
	protected static int counterObjects = 1;

	protected BaseDatatype() {
	}

	protected abstract void setID();

	@Override
	public void accept(JsonGeneratorVisitor visitor) {
		super.accept(visitor);
		visitor.visit(this);
	}
}

<|next_version|>
package de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.datatypes;

import de.uni_stuttgart.vis.vowl.owl2vowl.constants.Node_Types;
import de.uni_stuttgart.vis.vowl.owl2vowl.export.JsonGeneratorVisitor;
import de.uni_stuttgart.vis.vowl.owl2vowl.model.nodes.BaseNode;

public abstract class BaseDatatype extends BaseNode {
	protected static int counterObjects = 1;

	protected BaseDatatype() {
		setType(Node_Types.TYPE_DATATYPE);
	}

	protected abstract void setID();

	@Override
	public void accept(JsonGeneratorVisitor visitor) {
		super.accept(visitor);
		visitor.visit(this);
	}
}


Add Subscriber dependency to droninit

Add Subscriber dependency to droninit

--- implementation/drone/drone-init/src/java/org/inaetics/dronessimulator/drone/droneinit/Activator.java
+++ implementation/drone/drone-init/src/java/org/inaetics/dronessimulator/drone/droneinit/Activator.java
@@ -3,6 +3,7 @@
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.inaetics.dronessimulator.discovery.api.Discoverer;
+import org.inaetics.dronessimulator.pubsub.api.subscriber.Subscriber;
 import org.osgi.framework.BundleContext;

 public class Activator extends DependencyActivatorBase {
@@ -12,6 +13,10 @@
                 .setInterface(DroneInit.class.getName(), null)
                 .setImplementation(DroneInit.class)
                 .add(createServiceDependency()
+                        .setService(Subscriber.class)
+                        .setRequired(true)
+                )
+                .add(createServiceDependency()
                         .setService(Discoverer.class)
                         .setRequired(true)
                 )

<|original_code|>
package org.inaetics.dronessimulator.drone.droneinit;

import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.inaetics.dronessimulator.discovery.api.Discoverer;
import org.osgi.framework.BundleContext;

public class Activator extends DependencyActivatorBase {
    @Override
    public void init(BundleContext bundleContext, DependencyManager dependencyManager) throws Exception {
        dependencyManager.add(createComponent()
                .setInterface(DroneInit.class.getName(), null)
                .setImplementation(DroneInit.class)
                .add(createServiceDependency()
                        .setService(Discoverer.class)
                        .setRequired(true)
                )
                .setCallbacks("init", "start", "stop", "destroy")
        );
    }
}
<|edits_diff|>
--- implementation/drone/drone-init/src/java/org/inaetics/dronessimulator/drone/droneinit/Activator.java
+++ implementation/drone/drone-init/src/java/org/inaetics/dronessimulator/drone/droneinit/Activator.java
@@ -3,6 +3,7 @@
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.inaetics.dronessimulator.discovery.api.Discoverer;
+import org.inaetics.dronessimulator.pubsub.api.subscriber.Subscriber;
 import org.osgi.framework.BundleContext;

 public class Activator extends DependencyActivatorBase {
<|current_version|>
package org.inaetics.dronessimulator.drone.droneinit;

import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.inaetics.dronessimulator.discovery.api.Discoverer;
import org.inaetics.dronessimulator.pubsub.api.subscriber.Subscriber;
import org.osgi.framework.BundleContext;

public class Activator extends DependencyActivatorBase {
    @Override
    public void init(BundleContext bundleContext, DependencyManager dependencyManager) throws Exception {
        dependencyManager.add(createComponent()
                .setInterface(DroneInit.class.getName(), null)
                .setImplementation(DroneInit.class)
                .add(createServiceDependency()
                        .setService(Discoverer.class)
                        .setRequired(true)
                )
                .setCallbacks("init", "start", "stop", "destroy")
        );
    }
}
<|next_version|>
package org.inaetics.dronessimulator.drone.droneinit;

import org.apache.felix.dm.DependencyActivatorBase;
import org.apache.felix.dm.DependencyManager;
import org.inaetics.dronessimulator.discovery.api.Discoverer;
import org.inaetics.dronessimulator.pubsub.api.subscriber.Subscriber;
import org.osgi.framework.BundleContext;

public class Activator extends DependencyActivatorBase {
    @Override
    public void init(BundleContext bundleContext, DependencyManager dependencyManager) throws Exception {
        dependencyManager.add(createComponent()
                .setInterface(DroneInit.class.getName(), null)
                .setImplementation(DroneInit.class)
                .add(createServiceDependency()
                        .setService(Subscriber.class)
                        .setRequired(true)
                )
                .add(createServiceDependency()
                        .setService(Discoverer.class)
                        .setRequired(true)
                )
                .setCallbacks("init", "start", "stop", "destroy")
        );
    }
}


Add in test for MultipleIndexCommandUtil

--- src/test/java/seedu/ezdo/commons/core/ConstructorTest.java
+++ src/test/java/seedu/ezdo/commons/core/ConstructorTest.java
@@ -7,6 +7,7 @@
 import seedu.ezdo.commons.util.CollectionUtil;
 import seedu.ezdo.commons.util.ConfigUtil;
 import seedu.ezdo.commons.util.FxViewUtil;
+import seedu.ezdo.commons.util.MultipleIndexCommandUtil;
 import seedu.ezdo.commons.util.UrlUtil;
 import seedu.ezdo.logic.parser.CliSyntax;
 import seedu.ezdo.model.util.SampleDataUtil;
@@ -23,5 +24,6 @@
         assertNotNull(new CollectionUtil());
         assertNotNull(new LogsCenter());
         assertNotNull(new FxViewUtil());
+        assertNotNull(new MultipleIndexCommandUtil());
     }
 }

<|original_code|>
package seedu.ezdo.commons.core;

import static org.junit.Assert.assertNotNull;

import org.junit.Test;

import seedu.ezdo.commons.util.CollectionUtil;
import seedu.ezdo.commons.util.ConfigUtil;
import seedu.ezdo.commons.util.FxViewUtil;
import seedu.ezdo.commons.util.UrlUtil;
import seedu.ezdo.logic.parser.CliSyntax;
import seedu.ezdo.model.util.SampleDataUtil;
//@@author A0139248X
public class ConstructorTest {

    @Test
    public void construct_notNull() {
        assertNotNull(new Messages());
        assertNotNull(new SampleDataUtil());
        assertNotNull(new ConfigUtil());
        assertNotNull(new UrlUtil());
        assertNotNull(new CliSyntax());
        assertNotNull(new CollectionUtil());
        assertNotNull(new LogsCenter());
        assertNotNull(new FxViewUtil());
    }
}

<|edits_diff|>
--- src/test/java/seedu/ezdo/commons/core/ConstructorTest.java
+++ src/test/java/seedu/ezdo/commons/core/ConstructorTest.java
@@ -7,6 +7,7 @@
 import seedu.ezdo.commons.util.CollectionUtil;
 import seedu.ezdo.commons.util.ConfigUtil;
 import seedu.ezdo.commons.util.FxViewUtil;
+import seedu.ezdo.commons.util.MultipleIndexCommandUtil;
 import seedu.ezdo.commons.util.UrlUtil;
 import seedu.ezdo.logic.parser.CliSyntax;
 import seedu.ezdo.model.util.SampleDataUtil;
<|current_version|>
package seedu.ezdo.commons.core;

import static org.junit.Assert.assertNotNull;

import org.junit.Test;

import seedu.ezdo.commons.util.CollectionUtil;
import seedu.ezdo.commons.util.ConfigUtil;
import seedu.ezdo.commons.util.FxViewUtil;
import seedu.ezdo.commons.util.MultipleIndexCommandUtil;
import seedu.ezdo.commons.util.UrlUtil;
import seedu.ezdo.logic.parser.CliSyntax;
import seedu.ezdo.model.util.SampleDataUtil;
//@@author A0139248X
public class ConstructorTest {

    @Test
    public void construct_notNull() {
        assertNotNull(new Messages());
        assertNotNull(new SampleDataUtil());
        assertNotNull(new ConfigUtil());
        assertNotNull(new UrlUtil());
        assertNotNull(new CliSyntax());
        assertNotNull(new CollectionUtil());
        assertNotNull(new LogsCenter());
        assertNotNull(new FxViewUtil());
    }
}

<|next_version|>
package seedu.ezdo.commons.core;

import static org.junit.Assert.assertNotNull;

import org.junit.Test;

import seedu.ezdo.commons.util.CollectionUtil;
import seedu.ezdo.commons.util.ConfigUtil;
import seedu.ezdo.commons.util.FxViewUtil;
import seedu.ezdo.commons.util.MultipleIndexCommandUtil;
import seedu.ezdo.commons.util.UrlUtil;
import seedu.ezdo.logic.parser.CliSyntax;
import seedu.ezdo.model.util.SampleDataUtil;
//@@author A0139248X
public class ConstructorTest {

    @Test
    public void construct_notNull() {
        assertNotNull(new Messages());
        assertNotNull(new SampleDataUtil());
        assertNotNull(new ConfigUtil());
        assertNotNull(new UrlUtil());
        assertNotNull(new CliSyntax());
        assertNotNull(new CollectionUtil());
        assertNotNull(new LogsCenter());
        assertNotNull(new FxViewUtil());
        assertNotNull(new MultipleIndexCommandUtil());
    }
}


Fix test goal for core

Fix test goal for core

--- core/tests/playn/shared/json/AbstractJsonTest.java
+++ core/tests/playn/shared/json/AbstractJsonTest.java
@@ -13,9 +13,12 @@
  */
 package playn.shared.json;

+import org.junit.Ignore;
+
 import playn.core.Json;
 import playn.core.json.JsonImpl;

+@Ignore
 public class AbstractJsonTest {
   protected Json json() {
     return new JsonImpl();

<|original_code|>
/**
 * Copyright 2011 The PlayN 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 playn.shared.json;

import playn.core.Json;
import playn.core.json.JsonImpl;

public class AbstractJsonTest {
  protected Json json() {
    return new JsonImpl();
  }
}

<|edits_diff|>
--- core/tests/playn/shared/json/AbstractJsonTest.java
+++ core/tests/playn/shared/json/AbstractJsonTest.java
@@ -13,6 +13,8 @@
  */
 package playn.shared.json;

+import org.junit.Ignore;
+
 import playn.core.Json;
 import playn.core.json.JsonImpl;

<|current_version|>
/**
 * Copyright 2011 The PlayN 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 playn.shared.json;

import org.junit.Ignore;

import playn.core.Json;
import playn.core.json.JsonImpl;

public class AbstractJsonTest {
  protected Json json() {
    return new JsonImpl();
  }
}

<|next_version|>
/**
 * Copyright 2011 The PlayN 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 playn.shared.json;

import org.junit.Ignore;

import playn.core.Json;
import playn.core.json.JsonImpl;

@Ignore
public class AbstractJsonTest {
  protected Json json() {
    return new JsonImpl();
  }
}


Add default DateTimeFormat to parse/format DateTimes in UTC (ISO8601)

--- src/main/java/com/vnadgir/hal/HalApplication.java
+++ src/main/java/com/vnadgir/hal/HalApplication.java
@@ -1,5 +1,9 @@
 package com.vnadgir.hal;

+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
 import com.theoryinpractise.halbuilder.api.RepresentationFactory;
 import com.theoryinpractise.halbuilder.standard.StandardRepresentationFactory;
 import com.vnadgir.hal.api.resources.TestSessionResource;
@@ -9,11 +13,16 @@
 import io.dropwizard.setup.Environment;

 import javax.ws.rs.client.Client;
+import java.text.SimpleDateFormat;

 public class HalApplication extends io.dropwizard.Application<HalConfiguration> {

     @Override
     public void run(HalConfiguration halConfiguration, Environment environment) throws Exception {
+        ObjectMapper objectMapper = environment.getObjectMapper();
+        objectMapper.registerModule(new JodaModule());
+        objectMapper.setDateFormat(new ISO8601DateFormat());
+
         final Client client = new JerseyClientBuilder(environment)
                 .build(getName());

<|original_code|>
package com.vnadgir.hal;

import com.theoryinpractise.halbuilder.api.RepresentationFactory;
import com.theoryinpractise.halbuilder.standard.StandardRepresentationFactory;
import com.vnadgir.hal.api.resources.TestSessionResource;
import com.vnadgir.hal.api.resources.TestSessionsClientResource;
import com.vnadgir.hal.api.resources.TestSessionsService;
import io.dropwizard.client.JerseyClientBuilder;
import io.dropwizard.setup.Environment;

import javax.ws.rs.client.Client;

public class HalApplication extends io.dropwizard.Application<HalConfiguration> {

    @Override
    public void run(HalConfiguration halConfiguration, Environment environment) throws Exception {
        final Client client = new JerseyClientBuilder(environment)
                .build(getName());

        TestSessionsService testSessionsService = new TestSessionsService();
        RepresentationFactory representationFactory = new StandardRepresentationFactory();

        environment.jersey().register(new TestSessionsClientResource(client));
        environment.jersey().register(new TestSessionResource(testSessionsService, representationFactory));
    }

    @Override
    public String getName(){
        return "hal-dw";
    }

    public static void main(String[] args) throws Exception {
        new HalApplication().run(args);
    }
}

<|edits_diff|>
--- src/main/java/com/vnadgir/hal/HalApplication.java
+++ src/main/java/com/vnadgir/hal/HalApplication.java
@@ -1,5 +1,9 @@
 package com.vnadgir.hal;

+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
 import com.theoryinpractise.halbuilder.api.RepresentationFactory;
 import com.theoryinpractise.halbuilder.standard.StandardRepresentationFactory;
 import com.vnadgir.hal.api.resources.TestSessionResource;
@@ -9,6 +13,7 @@
 import io.dropwizard.setup.Environment;

 import javax.ws.rs.client.Client;
+import java.text.SimpleDateFormat;

 public class HalApplication extends io.dropwizard.Application<HalConfiguration> {

<|current_version|>
package com.vnadgir.hal;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
import com.fasterxml.jackson.datatype.joda.JodaModule;
import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
import com.theoryinpractise.halbuilder.api.RepresentationFactory;
import com.theoryinpractise.halbuilder.standard.StandardRepresentationFactory;
import com.vnadgir.hal.api.resources.TestSessionResource;
import com.vnadgir.hal.api.resources.TestSessionsClientResource;
import com.vnadgir.hal.api.resources.TestSessionsService;
import io.dropwizard.client.JerseyClientBuilder;
import io.dropwizard.setup.Environment;

import javax.ws.rs.client.Client;
import java.text.SimpleDateFormat;

public class HalApplication extends io.dropwizard.Application<HalConfiguration> {

    @Override
    public void run(HalConfiguration halConfiguration, Environment environment) throws Exception {
        final Client client = new JerseyClientBuilder(environment)
                .build(getName());

        TestSessionsService testSessionsService = new TestSessionsService();
        RepresentationFactory representationFactory = new StandardRepresentationFactory();

        environment.jersey().register(new TestSessionsClientResource(client));
        environment.jersey().register(new TestSessionResource(testSessionsService, representationFactory));
    }

    @Override
    public String getName(){
        return "hal-dw";
    }

    public static void main(String[] args) throws Exception {
        new HalApplication().run(args);
    }
}

<|next_version|>
package com.vnadgir.hal;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
import com.fasterxml.jackson.datatype.joda.JodaModule;
import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer;
import com.theoryinpractise.halbuilder.api.RepresentationFactory;
import com.theoryinpractise.halbuilder.standard.StandardRepresentationFactory;
import com.vnadgir.hal.api.resources.TestSessionResource;
import com.vnadgir.hal.api.resources.TestSessionsClientResource;
import com.vnadgir.hal.api.resources.TestSessionsService;
import io.dropwizard.client.JerseyClientBuilder;
import io.dropwizard.setup.Environment;

import javax.ws.rs.client.Client;
import java.text.SimpleDateFormat;

public class HalApplication extends io.dropwizard.Application<HalConfiguration> {

    @Override
    public void run(HalConfiguration halConfiguration, Environment environment) throws Exception {
        ObjectMapper objectMapper = environment.getObjectMapper();
        objectMapper.registerModule(new JodaModule());
        objectMapper.setDateFormat(new ISO8601DateFormat());

        final Client client = new JerseyClientBuilder(environment)
                .build(getName());

        TestSessionsService testSessionsService = new TestSessionsService();
        RepresentationFactory representationFactory = new StandardRepresentationFactory();

        environment.jersey().register(new TestSessionsClientResource(client));
        environment.jersey().register(new TestSessionResource(testSessionsService, representationFactory));
    }

    @Override
    public String getName(){
        return "hal-dw";
    }

    public static void main(String[] args) throws Exception {
        new HalApplication().run(args);
    }
}