7.2

.github/workflows/verify.yml

@@ -0,0 +1,125 @@
+name: SF and Build Test
+on:
+  pull_request:
+    branches: [ master, 7.3, 7.2 ]
+jobs:
+  CheckSourceFormatting:
+    name: Check source formatting
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build
+        shell: bash
+        run: |
+          cd liferay-workspace
+          ./gradlew --no-daemon checkSourceFormatting
+          cd ../maven
+          mvn source-formatter:format
+  Maven-Linux-JDK8:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: |
+        cd maven
+        mvn clean package
+  Maven-Linux-JDK11:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Build with Maven
+      run: |
+        cd maven
+        mvn clean package
+  Maven-MacOS-JDK8:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: |
+        cd maven
+        mvn clean package
+  Maven-Windows-JDK8:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: |
+        cd maven
+        mvn clean package
+  Gradle-Linux-JDK8:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: |
+        cd liferay-workspace
+        ./gradlew --no-daemon clean assemble
+  Gradle-Linux-JDK11:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Build with Gradle
+      run: |
+        cd liferay-workspace
+        ./gradlew --no-daemon clean assemble
+  Gradle-MacOS-JDK8:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: |
+        cd liferay-workspace
+        ./gradlew --no-daemon clean assemble
+  Gradle-Windows-JDK8:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: |
+        cd liferay-workspace
+        ./gradlew --no-daemon clean assemble

gradle/apps/service-builder/dsp/dsp-api/bnd.bnd

@@ -0,0 +1,10 @@
+Bundle-Name: dsp-api
+Bundle-SymbolicName: com.liferay.blade.samples.dspservicebuilder.api
+Bundle-Version: 1.0.0
+Export-Package:\
+	com.liferay.blade.samples.dspservicebuilder.exception,\
+    com.liferay.blade.samples.dspservicebuilder.model,\
+	com.liferay.blade.samples.dspservicebuilder.service,\
+	com.liferay.blade.samples.dspservicebuilder.service.persistence
+-check: EXPORTS
+-includeresource: META-INF/service.xml=../dsp-service/service.xml

gradle/apps/service-builder/dsp/dsp-api/build.gradle

@@ -0,0 +1,9 @@
+dependencies {
+	compileOnly group: "biz.aQute.bnd", name: "biz.aQute.bndlib", version: "3.5.0"
+	compileOnly group: "com.liferay", name: "com.liferay.petra.lang", version: "3.0.0"
+	compileOnly group: "com.liferay", name: "com.liferay.petra.string", version: "3.0.0"
+	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "4.4.0"
+	compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
+	compileOnly group: "org.osgi", name: "org.osgi.core", version: "6.0.0"
+	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
+}

liferay-workspace/apps/kotlin-portlet/src/main/resources/META-INF/resources/view.jsp → gradle/apps/service-builder/dsp/dsp-api/src/main/java/com/liferay/blade/samples/dspservicebuilder/exception/NoSuchCountryException.java

@@ -1,4 +1,3 @@
-<%--
 /**
  * Copyright 2000-present Liferay, Inc.
  *
@@ -14,20 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
---%>
+package com.liferay.blade.samples.dspservicebuilder.exception;
 
-<%@ include file="/init.jsp" %>
+import com.liferay.portal.kernel.exception.NoSuchModelException;
 
-<%= (String)renderRequest.getAttribute(KotlinGreeterPortletKeys.GreeterMessage) %>
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class NoSuchCountryException extends NoSuchModelException {
+
+	public NoSuchCountryException() {
+	}
 
-<liferay-ui:message key="blade_portlet_kotlinactioncommand_KotlinGreeterPortlet.caption" />
+	public NoSuchCountryException(String msg) {
+		super(msg);
+	}
 
-<liferay-portlet:actionURL name="greet" var="greetURL" />
+	public NoSuchCountryException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 
-<aui:form action="<%= greetURL %>" method="post" name="fm">
-	<aui:input name="name" type="text" />
+	public NoSuchCountryException(Throwable cause) {
+		super(cause);
+	}
 
-	<aui:button-row>
-		<aui:button type="submit"></aui:button>
-	</aui:button-row>
-</aui:form>
+}

gradle/apps/service-builder/dsp/dsp-api/src/main/java/com/liferay/blade/samples/dspservicebuilder/model/Country.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2000-present Liferay, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.liferay.blade.samples.dspservicebuilder.model;
+
+import com.liferay.portal.kernel.annotation.ImplementationClassName;
+import com.liferay.portal.kernel.model.PersistedModel;
+import com.liferay.portal.kernel.util.Accessor;
+
+import org.osgi.annotation.versioning.ProviderType;
+
+/**
+ * The extended model interface for the Country service. Represents a row in the "country" database table, with each column mapped to a property of this class.
+ *
+ * @author Brian Wing Shun Chan
+ * @see CountryModel
+ * @generated
+ */
+@ImplementationClassName(
+	"com.liferay.blade.samples.dspservicebuilder.model.impl.CountryImpl"
+)
+@ProviderType
+public interface Country extends CountryModel, PersistedModel {
+
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify this interface directly. Add methods to <code>com.liferay.blade.samples.dspservicebuilder.model.impl.CountryImpl</code> and rerun ServiceBuilder to automatically copy the method declarations to this interface.
+	 */
+	public static final Accessor<Country, Long> COUNTRY_ID_ACCESSOR =
+		new Accessor<Country, Long>() {
+
+			@Override
+			public Long get(Country country) {
+				return country.getCountryId();
+			}
+
+			@Override
+			public Class<Long> getAttributeClass() {
+				return Long.class;
+			}
+
+			@Override
+			public Class<Country> getTypeClass() {
+				return Country.class;
+			}
+
+		};
+
+}

gradle/apps/service-builder/dsp/dsp-api/src/main/java/com/liferay/blade/samples/dspservicebuilder/model/CountryModel.java

@@ -0,0 +1,87 @@
+/**
+ * Copyright 2000-present Liferay, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.liferay.blade.samples.dspservicebuilder.model;
+
+import com.liferay.portal.kernel.bean.AutoEscape;
+import com.liferay.portal.kernel.model.BaseModel;
+
+import org.osgi.annotation.versioning.ProviderType;
+
+/**
+ * The base model interface for the Country service. Represents a row in the "country" database table, with each column mapped to a property of this class.
+ *
+ * <p>
+ * This interface and its corresponding implementation <code>com.liferay.blade.samples.dspservicebuilder.model.impl.CountryModelImpl</code> exist only as a container for the default property accessors generated by ServiceBuilder. Helper methods and all application logic should be put in <code>com.liferay.blade.samples.dspservicebuilder.model.impl.CountryImpl</code>.
+ * </p>
+ *
+ * @author Brian Wing Shun Chan
+ * @see Country
+ * @generated
+ */
+@ProviderType
+public interface CountryModel extends BaseModel<Country> {
+
+	/*
+	 * NOTE FOR DEVELOPERS:
+	 *
+	 * Never modify or reference this interface directly. All methods that expect a country model instance should use the {@link Country} interface instead.
+	 */
+
+	/**
+	 * Returns the primary key of this country.
+	 *
+	 * @return the primary key of this country
+	 */
+	public long getPrimaryKey();
+
+	/**
+	 * Sets the primary key of this country.
+	 *
+	 * @param primaryKey the primary key of this country
+	 */
+	public void setPrimaryKey(long primaryKey);
+
+	/**
+	 * Returns the country ID of this country.
+	 *
+	 * @return the country ID of this country
+	 */
+	public long getCountryId();
+
+	/**
+	 * Sets the country ID of this country.
+	 *
+	 * @param countryId the country ID of this country
+	 */
+	public void setCountryId(long countryId);
+
+	/**
+	 * Returns the country name of this country.
+	 *
+	 * @return the country name of this country
+	 */
+	@AutoEscape
+	public String getCountryName();
+
+	/**
+	 * Sets the country name of this country.
+	 *
+	 * @param countryName the country name of this country
+	 */
+	public void setCountryName(String countryName);
+
+}