Commit 2e220c1d authored by Martti Käärik's avatar Martti Käärik
Browse files

Updated TRI

parent 30ecb3b3

plugins/org.etsi.mts.tdl.execution.java.runtime/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<modelVersion>4.0.0</modelVersion>

	<groupId>org.etsi.mts.tdl</groupId>

	<artifactId>org.etsi.mts.tdl.execution.java</artifactId>

	<version>1.0.0-SNAPSHOT</version>

	<version>1.0.0</version>

	<build>

		<sourceDirectory>src</sourceDirectory>

		<plugins>

plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/DefaultAdapter.java

+1 −5
Original line number Diff line number Diff line
@@ -2,20 +2,16 @@ package org.etsi.mts.tdl.execution.java.adapters; 


import org.etsi.mts.tdl.execution.java.tri.Data;

import org.etsi.mts.tdl.execution.java.tri.Reporter;

import org.etsi.mts.tdl.execution.java.tri.RuntimeHelper;

import org.etsi.mts.tdl.execution.java.tri.StopException;

import org.etsi.mts.tdl.execution.java.tri.Validator;

import org.etsi.mts.tdl.execution.java.tri.Verdict;



public class DefaultAdapter implements Validator, Reporter, RuntimeHelper {

public class DefaultAdapter implements Validator, Reporter {



	@Override

	public boolean equals(Object o0, Object o1) {

		// TODO Auto-generated method stub

		return false;

	}



	@Override

	public <T> T clone(T object) {

		// TODO Auto-generated method stub

		return object;

plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java

+8 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import org.etsi.mts.tdl.execution.java.tri.Connection; 
import org.etsi.mts.tdl.execution.java.tri.Data;

import org.etsi.mts.tdl.execution.java.tri.ElementAnnotation;

import org.etsi.mts.tdl.execution.java.tri.Mapping;

import org.etsi.mts.tdl.execution.java.tri.NamedElement;

import org.etsi.mts.tdl.execution.java.tri.Procedure;

import org.etsi.mts.tdl.execution.java.tri.Reporter;

import org.etsi.mts.tdl.execution.java.tri.SystemAdapter;
@@ -267,6 +268,11 @@ public class HttpSystemAdapter implements SystemAdapter { 
		throw new UnsupportedOperationException("Procedure-based communication is not supported by this adapter.");

	}



	@Override

	public Data callFunction(NamedElement function, Argument[] arguments) {

		throw new UnsupportedOperationException("Custom function implementations should be provided by extensions.");

	}



	protected HttpRequestData getRequestData(Data message) {

		if (message.getValue() instanceof HttpRequestData)

			return (HttpRequestData) message.getValue();
@@ -290,8 +296,8 @@ public class HttpSystemAdapter implements SystemAdapter { 


		Mapping rs = m.getResource();

		boolean isMapped = false;

		for (ElementAnnotation a : rs.annotations) {

			if (a.key.equals("Tdl::MappingName") && a.value.equals("Java")) {

		for (ElementAnnotation a : rs.getAnnotations()) {

			if (a.getKey().equals("Tdl::MappingName") && a.getValue().equals("Java")) {

				isMapped = true;

				break;

			}

plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/ArgumentImpl.java

0 → 100644
+21 −0
Original line number Diff line number Diff line 
package org.etsi.mts.tdl.execution.java.rt.core;



import org.etsi.mts.tdl.execution.java.tri.Data;



public class ArgumentImpl<T, V> extends DataImpl<T, V> {

	private String parameterName;



	public ArgumentImpl(T type, V value, String parameterName) {

		super(type, value);

		this.parameterName = parameterName;

	}



	public ArgumentImpl(Data<T, V> data, String parameterName) {

		super(data.getType(), data.getValue());

		this.parameterName = parameterName;

	}



	public String getParameterName() {

		return parameterName;

	}

}

plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/rt/core/ConnectionImpl.java

0 → 100644
+27 −0
Original line number Diff line number Diff line 
package org.etsi.mts.tdl.execution.java.rt.core;



import org.etsi.mts.tdl.execution.java.tri.Connection;

import org.etsi.mts.tdl.execution.java.tri.GateReference;



public class ConnectionImpl extends ElementImpl implements Connection {





	private final GateReference[] endPoints = new GateReference[2];



	public ConnectionImpl(String name, GateReference sourceGate, GateReference targetGate) {

		super(name);

		getEndPoints()[0] = sourceGate;

		getEndPoints()[1] = targetGate;

	}

	

	public GateReference[] getEndPoints() {

		return endPoints;

	}



	@Override

	public String toString() {

		if (name != null)

			return name;

		return getEndPoints()[0].toString() + " :: " + getEndPoints()[1].toString();

	}

}